foreman-export-daemontools 0.0.1 → 0.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. data.tar.gz.sig +0 -0
  2. data/History.rdoc +5 -0
  3. data/Manifest.txt +0 -4
  4. data/Rakefile +1 -1
  5. data/data/foreman-export-daemontools/templates/log-run.erb +1 -1
  6. data/lib/foreman/export/daemontools.rb +9 -7
  7. data/spec/foreman/export/daemontools_spec.rb +5 -2
  8. metadata +46 -20
  9. metadata.gz.sig +0 -0
  10. data/.env +0 -5
  11. data/.foreman +0 -2
  12. data/spec/data/.env +0 -2
  13. data/spec/data/.foreman +0 -2
data.tar.gz.sig CHANGED
Binary file
data/History.rdoc CHANGED
@@ -1,3 +1,8 @@
1
+ == v0.1.0 [2013-01-01] Michael Granger <ged@FaerieMUD.org>
2
+
3
+ Updated for newer versions of Foreman.
4
+
5
+
1
6
  == v0.0.1 [2012-04-27] Michael Granger <ged@FaerieMUD.org>
2
7
 
3
8
  Initial release.
data/Manifest.txt CHANGED
@@ -1,5 +1,3 @@
1
- .env
2
- .foreman
3
1
  ChangeLog
4
2
  History.rdoc
5
3
  Manifest.txt
@@ -9,8 +7,6 @@ Rakefile
9
7
  data/foreman-export-daemontools/templates/log-run.erb
10
8
  data/foreman-export-daemontools/templates/run.erb
11
9
  lib/foreman/export/daemontools.rb
12
- spec/data/.env
13
- spec/data/.foreman
14
10
  spec/data/Procfile
15
11
  spec/foreman/export/daemontools_spec.rb
16
12
  spec/helpers.rb
data/Rakefile CHANGED
@@ -16,7 +16,7 @@ hoespec = Hoe.spec( 'foreman-export-daemontools' ) do
16
16
 
17
17
  self.developer 'Michael Granger', 'ged@FaerieMUD.org'
18
18
 
19
- self.dependency 'foreman', '~> 0.45'
19
+ self.dependency 'foreman', '~> 0.60'
20
20
  self.dependency 'hoe-deveiate', '~> 0.1', :developer
21
21
 
22
22
  self.spec_extras[:licenses] = ["BSD"]
data/data/foreman-export-daemontools/templates/log-run.erb CHANGED
@@ -1,7 +1,7 @@
1
1
  #!/bin/sh
2
2
 
3
3
  <% if self.log %>
4
- % logdir = self.log + '/' + procdir.basename
4
+ % logdir = Pathname(self.log) + '/' + procdir.basename
5
5
  exec setuidgid <%= user %> multilog t <%= logdir %>
6
6
  <% else %>
7
7
  exec setuidgid <%= user %> multilog t ./main
data/lib/foreman/export/daemontools.rb CHANGED
@@ -17,10 +17,10 @@ require 'foreman/cli'
17
17
  class Foreman::Export::Daemontools < Foreman::Export::Base
18
18
 
19
19
  # Library version constant
20
- VERSION = '0.0.1'
20
+ VERSION = '0.1.0'
21
21
 
22
22
  # Version-control revision constant
23
- REVISION = %q$Revision: 7e1c6eafef91 $
23
+ REVISION = %q$Revision: 7220ff1516d7 $
24
24
 
25
25
  # The data directory in the project if that exists, otherwise the gem datadir
26
26
  DEFAULT_DATADIR = if ENV['FOREMAN_EXPORT_DATADIR']
@@ -81,11 +81,12 @@ class Foreman::Export::Daemontools < Foreman::Export::Base
81
81
  servicedir.mkpath
82
82
  end
83
83
 
84
- engine.procfile.entries.each do |process|
85
- say "Setting up %s-%s service directories..." % [ app, process.name ]
86
- count = self.concurrency[ process.name ]
84
+ engine.each_process do |name, process|
85
+ say "Setting up %s-%s service directories..." % [ app, name ]
86
+ count = engine.formation[ name ]
87
87
  say " concurrency = #{count}"
88
- procdir = servicedir + "%s-%s" % [ app, process.name ]
88
+ next unless count >= 1
89
+ procdir = servicedir + "%s-%s" % [ app, name ]
89
90
 
90
91
  # Create a numbered service dir for each instance if there are
91
92
  # more than one
@@ -107,6 +108,7 @@ class Foreman::Export::Daemontools < Foreman::Export::Base
107
108
 
108
109
  # Write the down file to keep the service from spinning up before the user has
109
110
  # a chance to look things over
111
+ say " writing the 'down' file"
110
112
  write_file( procdir + 'down', '' )
111
113
 
112
114
  # Set up logging
@@ -122,7 +124,7 @@ class Foreman::Export::Daemontools < Foreman::Export::Base
122
124
  say " setting up environment variables..."
123
125
  envdir = procdir + 'env'
124
126
  envdir.mkpath
125
- port = engine.port_for( process, num, self.port )
127
+ port = engine.port_for( process, num )
126
128
  environment_variables = { 'PORT' => port }.
127
129
  merge( engine.environment ).
128
130
  merge( inline_variables(process.command) )
data/spec/foreman/export/daemontools_spec.rb CHANGED
@@ -33,12 +33,12 @@ describe Foreman::Export::Daemontools do
33
33
  let( :servicedir ) { Pathname(Dir.tmpdir) + 'service' }
34
34
  let( :datadir ) { Pathname(__FILE__).dirname.parent.parent + 'data' }
35
35
  let( :procfile ) { datadir + 'Procfile' }
36
- let( :engine ) { Foreman::Engine.new(procfile) }
36
+ let( :engine ) { Foreman::Engine.new(options).load_procfile(procfile) }
37
37
  let( :options ) {{
38
38
  :app_root => datadir,
39
39
  :app => 'test',
40
40
  :env => datadir + '.env',
41
- :concurrency => 'cms=2,api=0,mongrel2=1',
41
+ :formation => 'cms=2,api=0,mongrel2=1',
42
42
  :user => 'www',
43
43
  }}
44
44
 
@@ -59,6 +59,9 @@ describe Foreman::Export::Daemontools do
59
59
 
60
60
 
61
61
  it "exports to the filesystem" do
62
+ engine.env['HOMEDIR'] = '/Users/ged'
63
+ engine.env['MONGREL2_HOME'] = '/var/run/mongrel2'
64
+
62
65
  subject.export
63
66
  servicedir.should exist()
64
67
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman-export-daemontools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.1
4
+ version: 0.1.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -36,22 +36,27 @@ cert_chain:
36
36
  YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
37
37
  Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
38
38
  cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
39
- date: 2012-05-02 00:00:00.000000000 Z
39
+ date: 2013-01-01 00:00:00.000000000 Z
40
40
  dependencies:
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: foreman
43
- requirement: &70130722360800 !ruby/object:Gem::Requirement
43
+ requirement: !ruby/object:Gem::Requirement
44
44
  none: false
45
45
  requirements:
46
46
  - - ~>
47
47
  - !ruby/object:Gem::Version
48
- version: '0.45'
48
+ version: '0.60'
49
49
  type: :runtime
50
50
  prerelease: false
51
- version_requirements: *70130722360800
51
+ version_requirements: !ruby/object:Gem::Requirement
52
+ none: false
53
+ requirements:
54
+ - - ~>
55
+ - !ruby/object:Gem::Version
56
+ version: '0.60'
52
57
  - !ruby/object:Gem::Dependency
53
58
  name: hoe-mercurial
54
- requirement: &70130722359620 !ruby/object:Gem::Requirement
59
+ requirement: !ruby/object:Gem::Requirement
55
60
  none: false
56
61
  requirements:
57
62
  - - ~>
@@ -59,10 +64,15 @@ dependencies:
59
64
  version: 1.4.0
60
65
  type: :development
61
66
  prerelease: false
62
- version_requirements: *70130722359620
67
+ version_requirements: !ruby/object:Gem::Requirement
68
+ none: false
69
+ requirements:
70
+ - - ~>
71
+ - !ruby/object:Gem::Version
72
+ version: 1.4.0
63
73
  - !ruby/object:Gem::Dependency
64
74
  name: hoe-highline
65
- requirement: &70130722357580 !ruby/object:Gem::Requirement
75
+ requirement: !ruby/object:Gem::Requirement
66
76
  none: false
67
77
  requirements:
68
78
  - - ~>
@@ -70,10 +80,15 @@ dependencies:
70
80
  version: 0.1.0
71
81
  type: :development
72
82
  prerelease: false
73
- version_requirements: *70130722357580
83
+ version_requirements: !ruby/object:Gem::Requirement
84
+ none: false
85
+ requirements:
86
+ - - ~>
87
+ - !ruby/object:Gem::Version
88
+ version: 0.1.0
74
89
  - !ruby/object:Gem::Dependency
75
90
  name: rdoc
76
- requirement: &70130722377660 !ruby/object:Gem::Requirement
91
+ requirement: !ruby/object:Gem::Requirement
77
92
  none: false
78
93
  requirements:
79
94
  - - ~>
@@ -81,10 +96,15 @@ dependencies:
81
96
  version: '3.10'
82
97
  type: :development
83
98
  prerelease: false
84
- version_requirements: *70130722377660
99
+ version_requirements: !ruby/object:Gem::Requirement
100
+ none: false
101
+ requirements:
102
+ - - ~>
103
+ - !ruby/object:Gem::Version
104
+ version: '3.10'
85
105
  - !ruby/object:Gem::Dependency
86
106
  name: hoe-deveiate
87
- requirement: &70130722371520 !ruby/object:Gem::Requirement
107
+ requirement: !ruby/object:Gem::Requirement
88
108
  none: false
89
109
  requirements:
90
110
  - - ~>
@@ -92,10 +112,15 @@ dependencies:
92
112
  version: '0.1'
93
113
  type: :development
94
114
  prerelease: false
95
- version_requirements: *70130722371520
115
+ version_requirements: !ruby/object:Gem::Requirement
116
+ none: false
117
+ requirements:
118
+ - - ~>
119
+ - !ruby/object:Gem::Version
120
+ version: '0.1'
96
121
  - !ruby/object:Gem::Dependency
97
122
  name: hoe
98
- requirement: &70130722405460 !ruby/object:Gem::Requirement
123
+ requirement: !ruby/object:Gem::Requirement
99
124
  none: false
100
125
  requirements:
101
126
  - - ~>
@@ -103,7 +128,12 @@ dependencies:
103
128
  version: '3.0'
104
129
  type: :development
105
130
  prerelease: false
106
- version_requirements: *70130722405460
131
+ version_requirements: !ruby/object:Gem::Requirement
132
+ none: false
133
+ requirements:
134
+ - - ~>
135
+ - !ruby/object:Gem::Version
136
+ version: '3.0'
107
137
  description: ! 'An exporter for David Dollar''s Foreman[https://github.com/ddollar/foreman]
108
138
  that
109
139
 
@@ -119,8 +149,6 @@ extra_rdoc_files:
119
149
  - Manifest.txt
120
150
  - README.rdoc
121
151
  files:
122
- - .env
123
- - .foreman
124
152
  - ChangeLog
125
153
  - History.rdoc
126
154
  - Manifest.txt
@@ -130,8 +158,6 @@ files:
130
158
  - data/foreman-export-daemontools/templates/log-run.erb
131
159
  - data/foreman-export-daemontools/templates/run.erb
132
160
  - lib/foreman/export/daemontools.rb
133
- - spec/data/.env
134
- - spec/data/.foreman
135
161
  - spec/data/Procfile
136
162
  - spec/foreman/export/daemontools_spec.rb
137
163
  - spec/helpers.rb
@@ -161,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
161
187
  version: '0'
162
188
  requirements: []
163
189
  rubyforge_project: foreman-export-daemontools
164
- rubygems_version: 1.8.16
190
+ rubygems_version: 1.8.24
165
191
  signing_key:
166
192
  specification_version: 3
167
193
  summary: An exporter for David Dollar's Foreman[https://github.com/ddollar/foreman]
metadata.gz.sig CHANGED
Binary file
data/.env DELETED
@@ -1,5 +0,0 @@
1
- MONGREL2=/Users/mgranger/source/C/mongrel2/bin/mongrel2
2
- STRELKA_DATADIR=/Users/mgranger/source/ruby/Strelka/data
3
- FANCYERRORS_DATADIR=/Users/mgranger/source/ruby/Strelka-FancyErrors/data/strelka-fancyerrors
4
- RUNMODE=development
5
- RUBYOPT=-I/Users/mgranger/source/ruby/Strelka-FancyErrors/lib:/Users/mgranger/source/ruby/Strelka/lib
data/.foreman DELETED
@@ -1,2 +0,0 @@
1
- concurrency: mongrel=0,cms=3
2
-
data/spec/data/.env DELETED
@@ -1,2 +0,0 @@
1
- HOMEDIR=/Users/ged
2
- MONGREL2_HOME=/var/run/mongrel2
data/spec/data/.foreman DELETED
@@ -1,2 +0,0 @@
1
- concurrency: cms=2,api=0,mongrel2=1
2
-