remove json export

michaeldwan · May 7, 2011 · 564aa74 · 564aa74
1 parent 95115f4
commit 564aa74
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 43 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -12,7 +12,6 @@ GEM
     diff-lcs (1.1.2)
     fakefs (0.2.1)
     hpricot (0.8.2)
-    json (1.5.1)
     mime-types (1.16)
     mustache (0.11.2)
     parka (0.6.2)
@@ -47,7 +46,6 @@ PLATFORMS
 
 DEPENDENCIES
   fakefs (~> 0.2.1)
-  json (~> 1.5.1)
   foreman!
   parka
   rake

diff --git a/foreman.gemspec b/foreman.gemspec
@@ -16,7 +16,6 @@ Gem::Specification.new do |gem|
   gem.files = Dir["**/*"].select { |d| d =~ %r{^(README|bin/|data/|ext/|lib/|spec/|test/)} }
   gem.files << "man/foreman.1"
 
-  gem.add_dependency 'json',           '~> 1.5.1'
   gem.add_dependency 'term-ansicolor', '~> 1.0.5'
   gem.add_dependency 'thor',           '>= 0.13.6'
 

diff --git a/lib/foreman/cli.rb b/lib/foreman/cli.rb
@@ -36,7 +36,6 @@ def export(format, location=nil)
     check_procfile!
 
     formatter = case format
-      when "json"    then Foreman::Export::JSON
       when "inittab" then Foreman::Export::Inittab
       when "upstart" then Foreman::Export::Upstart
       else error "Unknown export format: #{format}."

diff --git a/lib/foreman/export.rb b/lib/foreman/export.rb
@@ -4,6 +4,5 @@ module Foreman::Export
   class Exception < ::Exception; end
 end
 
-require "foreman/export/json"
 require "foreman/export/inittab"
 require "foreman/export/upstart"
diff --git a/lib/foreman/export/json.rb b/lib/foreman/export/json.rb
diff --git a/man/foreman.1 b/man/foreman.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "FOREMAN" "1" "March 2011" "Foreman 0.12.0.pre1" "Foreman Manual"
+.TH "FOREMAN" "1" "May 2011" "Foreman 0.12.0" "Foreman Manual"
 .
 .SH "NAME"
 \fBforeman\fR \- manage Procfile\-based applications
@@ -75,29 +75,13 @@ Specify an alternate location for the application\'s Procfile\. This file\'s con
 foreman currently supports the following output formats:
 .
 .IP "\(bu" 4
-json
-.
-.IP "\(bu" 4
 inittab
 .
 .IP "\(bu" 4
 upstart
 .
 .IP "" 0
 .
-.SH "JSON EXPORT"
-Will export your processes as JSON:
-.
-.IP "" 4
-.
-.nf
-
-{ "web": { "command": "bundle exec thin start" } }
-.
-.fi
-.
-.IP "" 0
-.
 .SH "INITTAB EXPORT"
 Will export a chunk of inittab\-compatible configuration:
 .

diff --git a/man/foreman.1.ronn b/man/foreman.1.ronn
@@ -75,18 +75,10 @@ These options control all modes of foreman's operation.
 
 foreman currently supports the following output formats:
 
-  * json
-
   * inittab
 
   * upstart
 
-## JSON EXPORT
-
-Will export your processes as JSON:
-
-    { "web": { "command": "bundle exec thin start" } }
-
 ## INITTAB EXPORT
 
 Will export a chunk of inittab-compatible configuration: