slushy 0.1.0 → 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/CHANGELOG.md +3 -0
- data/lib/slushy/instance.rb +1 -1
- data/lib/slushy/version.rb +1 -1
- data/spec/lib/instance_spec.rb +2 -1
- metadata +3 -3
data/CHANGELOG.md
CHANGED
data/lib/slushy/instance.rb
CHANGED
|
@@ -92,7 +92,7 @@ class Slushy::Instance
|
|
|
92
92
|
|
|
93
93
|
def converge(cookbooks_path) # TODO: find the standard Chef term for this
|
|
94
94
|
puts "Copying chef resources from provision directory..."
|
|
95
|
-
cookbooks_path = "#{cookbooks_path}/" unless cookbooks_path.end_with?('/')
|
|
95
|
+
cookbooks_path = "#{cookbooks_path}/" unless cookbooks_path.to_s.end_with?('/')
|
|
96
96
|
scp(cookbooks_path, '/tmp/chef-solo', :recursive => true)
|
|
97
97
|
puts "Converging server, this may take a while (10-20 minutes)"
|
|
98
98
|
run_command!('cd /tmp/chef-solo && sudo /var/lib/gems/1.8/bin/chef-solo -c solo.rb -j dna.json')
|
data/lib/slushy/version.rb
CHANGED
data/spec/lib/instance_spec.rb
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
require 'spec_helper'
|
|
2
2
|
require 'fog'
|
|
3
|
+
require 'pathname'
|
|
3
4
|
|
|
4
5
|
describe Slushy::Instance do
|
|
5
6
|
def mock_job(options={})
|
|
@@ -146,7 +147,7 @@ describe Slushy::Instance do
|
|
|
146
147
|
it "converges the given instance" do
|
|
147
148
|
instance.should_receive(:scp).ordered.with('some_path/', "/tmp/chef-solo", :recursive => true).and_return(true)
|
|
148
149
|
instance.should_receive(:run_command).ordered.with("cd /tmp/chef-solo && sudo /var/lib/gems/1.8/bin/chef-solo -c solo.rb -j dna.json").and_return(true)
|
|
149
|
-
capture_stdout { instance.converge('some_path') }
|
|
150
|
+
capture_stdout { instance.converge(Pathname.new('some_path')) }
|
|
150
151
|
end
|
|
151
152
|
end
|
|
152
153
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: slushy
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.1
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
112
112
|
version: '0'
|
|
113
113
|
segments:
|
|
114
114
|
- 0
|
|
115
|
-
hash:
|
|
115
|
+
hash: 663044203149620506
|
|
116
116
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
117
117
|
none: false
|
|
118
118
|
requirements:
|
|
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
121
121
|
version: '0'
|
|
122
122
|
segments:
|
|
123
123
|
- 0
|
|
124
|
-
hash:
|
|
124
|
+
hash: 663044203149620506
|
|
125
125
|
requirements: []
|
|
126
126
|
rubyforge_project:
|
|
127
127
|
rubygems_version: 1.8.21
|