Compare commits

..

7 Commits

Author SHA1 Message Date
David Dollar
c4de19f4da 0.13.1 2011-05-10 11:02:16 -04:00
David Dollar
490c8b73bf make sure to require yaml 2011-05-10 11:02:02 -04:00
David Dollar
f622f43cf4 update manual 2011-05-07 17:49:53 -04:00
David Dollar
9ab701f5b9 0.13.0 2011-05-07 14:52:58 -04:00
David Dollar
1a5d2428b9 tweak doc build tasks 2011-05-07 14:52:32 -04:00
David Dollar
564aa740e1 remove json export 2011-05-07 14:52:25 -04:00
David Dollar
95115f4e78 switch to "gemspec" stanza for Gemfile 2011-05-07 14:51:56 -04:00
10 changed files with 23 additions and 66 deletions

17
Gemfile
View File

@@ -1,18 +1,3 @@
source "http://rubygems.org"
group :development do
gem 'parka'
gem 'rake'
gem 'ronn'
end
group :test do
gem 'fakefs', '~> 0.2.1'
gem 'rcov', '~> 0.9.8'
gem 'rr', '~> 1.0.2'
gem 'rspec', '~> 2.0.0'
end
gem 'json', '~> 1.5.1'
gem 'term-ansicolor', '~> 1.0.5'
gem 'thor', '>= 0.13.6'
gemspec

View File

@@ -1,19 +1,27 @@
PATH
remote: .
specs:
foreman (0.13.1)
term-ansicolor (~> 1.0.5)
thor (>= 0.13.6)
GEM
remote: http://rubygems.org/
specs:
crack (0.1.8)
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.3.1)
parka (0.6.2)
crack
rest-client
thor
rake (0.8.7)
rcov (0.9.8)
rdiscount (1.6.5)
rest-client (1.6.0)
rest-client (1.6.1)
mime-types (>= 1.16)
ronn (0.7.3)
hpricot (>= 0.8.2)
@@ -38,12 +46,10 @@ PLATFORMS
DEPENDENCIES
fakefs (~> 0.2.1)
json (~> 1.5.1)
foreman!
parka
rake
rcov (~> 0.9.8)
ronn
rr (~> 1.0.2)
rspec (~> 2.0.0)
term-ansicolor (~> 1.0.5)
thor (>= 0.13.6)

View File

@@ -33,19 +33,23 @@ task :man do
ENV['RONN_MANUAL'] = "Foreman Manual"
ENV['RONN_ORGANIZATION'] = "Foreman #{Foreman::VERSION}"
sh "ronn -w -s toc -r5 --markdown man/*.ronn"
end
desc "Commit the manual to git"
task "man:commit" => :man do
sh "git add README.markdown"
sh "git commit -m 'update readme' || echo 'nothing to commit'"
end
desc "Generate the Github docs"
task :pages => :man do
task :pages => "man:commit" do
sh %{
cp man/foreman.1.html /tmp/foreman.1.html
git checkout gh-pages
rm ./index.html
cp /tmp/foreman.1.html ./index.html
git add -u index.html
git commit -m "rebuilding man page"
git commit -m "saving man page to github docs"
git push origin -f gh-pages
git checkout master
}

View File

@@ -16,10 +16,10 @@ 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'
gem.add_development_dependency 'parka'
gem.add_development_dependency 'rake'
gem.add_development_dependency 'ronn'
gem.add_development_dependency 'fakefs', '~> 0.2.1'

View File

@@ -2,6 +2,7 @@ require "foreman"
require "foreman/engine"
require "foreman/export"
require "thor"
require "yaml"
class Foreman::CLI < Thor
@@ -36,7 +37,6 @@ class Foreman::CLI < Thor
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}."

View File

@@ -4,6 +4,5 @@ module Foreman::Export
class Exception < ::Exception; end
end
require "foreman/export/json"
require "foreman/export/inittab"
require "foreman/export/upstart"

View File

@@ -1,13 +0,0 @@
require "foreman/export/base"
require "json"
class Foreman::Export::JSON < Foreman::Export::Base
def export(fname=nil, options={})
processes = engine.processes.values.inject({}) do |hash, process|
hash.update(process.name => { "command" => process.command })
end
puts processes.to_json
end
end

View File

@@ -1,5 +1,5 @@
module Foreman
VERSION = "0.12.0"
VERSION = "0.13.1"
end

View File

@@ -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.13.0" "Foreman Manual"
.
.SH "NAME"
\fBforeman\fR \- manage Procfile\-based applications
@@ -75,9 +75,6 @@ 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
@@ -85,19 +82,6 @@ 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:
.

View File

@@ -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: