cucumber-chef 3.0.0.rc.3 → 3.0.0.rc.4

Sign up to get free protection for your applications and to get access to all the features.
@@ -25,7 +25,7 @@ module Cucumber
25
25
  class ContainerError < Error; end
26
26
 
27
27
  class Container < ZTK::DSL::Base
28
- belongs_to :ecosystem, :class_name => "Cucumber::Chef:Ecosystem"
28
+ belongs_to :ecosystem, :class_name => "Cucumber::Chef::Ecosystem"
29
29
 
30
30
  attribute :name
31
31
  attribute :ip
@@ -25,7 +25,7 @@ module Cucumber
25
25
  class EcosystemError < Error; end
26
26
 
27
27
  class Ecosystem < ZTK::DSL::Base
28
- belongs_to :labfile, :class_name => "Cucumber::Chef:Labfile"
28
+ belongs_to :labfile, :class_name => "Cucumber::Chef::Labfile"
29
29
  has_many :containers, :class_name => "Cucumber::Chef::Container"
30
30
 
31
31
  attribute :name
@@ -222,6 +222,7 @@ module Cucumber
222
222
  {
223
223
  "cucumber-chef-mode" => Cucumber::Chef::Config.mode,
224
224
  "cucumber-chef-user" => Cucumber::Chef::Config.user,
225
+ "Name" => "cucumber-chef-#{Cucumber::Chef::Config.user}",
225
226
  "purpose" => "cucumber-chef"
226
227
  }.each do |k, v|
227
228
  tag = @connection.tags.new
@@ -162,11 +162,11 @@ module Cucumber
162
162
  end
163
163
 
164
164
  def ip
165
- "127.0.0.1"
165
+ "192.168.33.10"
166
166
  end
167
167
 
168
168
  def port
169
- 2222
169
+ 22
170
170
  end
171
171
 
172
172
  ################################################################################
@@ -38,7 +38,7 @@ module Cucumber
38
38
  @cookbooks_path = File.join(Cucumber::Chef.root_dir, "chef_repo", "cookbooks")
39
39
  @roles_path = File.join(Cucumber::Chef.root_dir, "chef_repo", "roles")
40
40
 
41
- @chef_pre_11 = (Cucumber::Chef::Config.chef[:server_version].to_f < 11.0)
41
+ @chef_pre_11 = Cucumber::Chef::Config.chef_pre_11
42
42
  bootstrap_template_file = (@chef_pre_11 ? 'ubuntu-precise-apt.erb' : 'ubuntu-precise-omnibus.erb')
43
43
  @bootstrap_template = File.join(Cucumber::Chef.root_dir, "lib", "cucumber", "chef", "templates", "bootstrap", bootstrap_template_file)
44
44
  end
@@ -92,7 +92,7 @@ module Cucumber
92
92
  arguments = Array.new
93
93
  arguments << "--user #{Cucumber::Chef::Config.user}"
94
94
  arguments << "--key #{Cucumber::Chef.chef_identity}"
95
- arguments << "--server-url #{self.chef_server_api}"
95
+ arguments << "--server-url https://#{self.ip}"
96
96
  arguments << "--disable-editing"
97
97
  arguments << "--yes"
98
98
  arguments << "-VV" if Cucumber::Chef.is_rc?
@@ -84,6 +84,12 @@ module Cucumber
84
84
  %x(wget -q -O - checkip.dyndns.org|sed -e 's/.*Current IP Address: //' -e 's/<.*$//').chomp.strip
85
85
  end
86
86
 
87
+ ################################################################################
88
+
89
+ def chef_pre_11
90
+ (Cucumber::Chef::Config.chef[:server_version].to_f < 11.0)
91
+ end
92
+
87
93
  ################################################################################
88
94
  # Path Helpers
89
95
  ################################################################################
@@ -24,7 +24,7 @@ module Cucumber
24
24
 
25
25
  ################################################################################
26
26
 
27
- VERSION = "3.0.0.rc.3" unless const_defined?(:VERSION)
27
+ VERSION = "3.0.0.rc.4" unless const_defined?(:VERSION)
28
28
 
29
29
  ################################################################################
30
30
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cucumber-chef
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0.rc.3
4
+ version: 3.0.0.rc.4
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
318
318
  version: 1.3.6
319
319
  requirements: []
320
320
  rubyforge_project:
321
- rubygems_version: 1.8.25
321
+ rubygems_version: 1.8.24
322
322
  signing_key:
323
323
  specification_version: 3
324
324
  summary: Test Driven Infrastructure