cuken 0.1.8 → 0.1.9

data/Gemfile

@@ -4,10 +4,12 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 group :default do
   gem 'aruba', "~> 0.3.6"
-  gem 'chef', "~>0.9.12"
+  gem "cucumber", ">= 0"
+  gem 'chef', "~>0.10.0.rc.0"
   gem 'grit', "~>2.4.1"
   gem 'rvm', "~>1.5.2"
   gem 'open4'
+  gem "vagrant", "~>0.7.2"
 end
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,28 +1,32 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    archive-tar-minitar (0.5.2)
     aruba (0.3.6)
       childprocess (>= 0.1.7)
       cucumber (>= 0.10.0)
       rspec (>= 2.5.0)
     builder (3.0.0)
     bunny (0.6.0)
-    chef (0.9.16)
+    chef (0.10.0.rc.0)
       bunny (>= 0.6.0)
       erubis
-      extlib
       highline
-      json (<= 1.4.6, >= 1.4.4)
+      json (<= 1.5.2, >= 1.4.4)
       mixlib-authentication (>= 1.1.0)
       mixlib-cli (>= 1.1.0)
       mixlib-config (>= 1.1.2)
-      mixlib-log (>= 1.2.0)
+      mixlib-log (>= 1.3.0)
       moneta
-      ohai (>= 0.5.7)
+      net-ssh (~> 2.1.3)
+      net-ssh-multi (~> 1.0.1)
+      ohai (>= 0.6.0)
       rest-client (< 1.7.0, >= 1.0.4)
+      treetop (~> 1.4.9)
       uuidtools
-    childprocess (0.1.8)
-      ffi (~> 1.0.6)
+    childprocess (0.1.7)
+      ffi (~> 0.6.3)
     cucumber (0.10.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -30,23 +34,25 @@ GEM
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
-    erubis (2.7.0)
-    extlib (0.9.15)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     fakefs (0.3.1)
-    ffi (1.0.7)
+    ffi (0.6.3)
       rake (>= 0.8.7)
-    gherkin (2.3.5)
+    gherkin (2.3.6)
       json (>= 1.4.6)
     git (1.2.5)
     grit (2.4.1)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
     highline (1.6.1)
+    i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    json (1.4.6)
+    json (1.5.1)
+    mario (0.0.6)
     mime-types (1.16)
     mixlib-authentication (1.1.4)
       mixlib-log
@@ -54,6 +60,14 @@ GEM
     mixlib-config (1.1.2)
     mixlib-log (1.3.0)
     moneta (0.6.0)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-ssh (2.1.4)
+    net-ssh-gateway (1.0.1)
+      net-ssh (>= 1.99.1)
+    net-ssh-multi (1.0.1)
+      net-ssh (>= 1.99.2)
+      net-ssh-gateway (>= 0.99.0)
     ohai (0.6.2)
       mixlib-cli
       mixlib-config
@@ -61,6 +75,7 @@ GEM
       systemu
       yajl-ruby
     open4 (1.0.1)
+    polyglot (0.3.1)
     rake (0.8.7)
     rcov (0.9.9)
     reek (1.2.8)
@@ -89,7 +104,22 @@ GEM
     sexp_processor (3.0.5)
     systemu (2.2.0)
     term-ansicolor (1.0.5)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
     uuidtools (2.1.2)
+    vagrant (0.7.3)
+      archive-tar-minitar (= 0.5.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      json (~> 1.5.1)
+      mario (~> 0.0.6)
+      net-scp (~> 1.0.4)
+      net-ssh (~> 2.1.0)
+      thor (~> 0.14.6)
+      virtualbox (~> 0.8.3)
+    virtualbox (0.8.3)
+      ffi (~> 0.6.3)
     yajl-ruby (0.8.2)
     yard (0.6.8)
 
@@ -99,7 +129,7 @@ PLATFORMS
 DEPENDENCIES
   aruba (~> 0.3.6)
   bundler (~> 1.0.11)
-  chef (~> 0.9.12)
+  chef (~> 0.10.0.rc.0)
   cucumber
   fakefs (~> 0.3.1)
   grit (~> 2.4.1)
@@ -111,4 +141,5 @@ DEPENDENCIES
   rr (~> 1.0.2)
   rspec (~> 2.5.0)
   rvm (~> 1.5.2)
+  vagrant (~> 0.7.2)
   yard (~> 0.6.0)

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/cuken.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cuken}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hedgehog"]
-  s.date = %q{2011-04-18}
+  s.date = %q{2011-04-21}
   s.description = %q{Reusable Cucumber steps and API for post-convergence system integration descriptions}
   s.email = %q{hedgehogshiatus@gmail.com}
   s.extra_rdoc_files = [
@@ -470,10 +470,12 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<aruba>, ["~> 0.3.6"])
-      s.add_runtime_dependency(%q<chef>, ["~> 0.9.12"])
+      s.add_runtime_dependency(%q<cucumber>, [">= 0"])
+      s.add_runtime_dependency(%q<chef>, ["~> 0.10.0.rc.0"])
       s.add_runtime_dependency(%q<grit>, ["~> 2.4.1"])
       s.add_runtime_dependency(%q<rvm>, ["~> 1.5.2"])
       s.add_runtime_dependency(%q<open4>, [">= 0"])
+      s.add_runtime_dependency(%q<vagrant>, ["~> 0.7.2"])
       s.add_development_dependency(%q<rr>, ["~> 1.0.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
@@ -486,10 +488,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<fakefs>, ["~> 0.3.1"])
     else
       s.add_dependency(%q<aruba>, ["~> 0.3.6"])
-      s.add_dependency(%q<chef>, ["~> 0.9.12"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<chef>, ["~> 0.10.0.rc.0"])
       s.add_dependency(%q<grit>, ["~> 2.4.1"])
       s.add_dependency(%q<rvm>, ["~> 1.5.2"])
       s.add_dependency(%q<open4>, [">= 0"])
+      s.add_dependency(%q<vagrant>, ["~> 0.7.2"])
       s.add_dependency(%q<rr>, ["~> 1.0.2"])
       s.add_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
@@ -503,10 +507,12 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<aruba>, ["~> 0.3.6"])
-    s.add_dependency(%q<chef>, ["~> 0.9.12"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<chef>, ["~> 0.10.0.rc.0"])
     s.add_dependency(%q<grit>, ["~> 2.4.1"])
     s.add_dependency(%q<rvm>, ["~> 1.5.2"])
     s.add_dependency(%q<open4>, [">= 0"])
+    s.add_dependency(%q<vagrant>, ["~> 0.7.2"])
     s.add_dependency(%q<rr>, ["~> 1.0.2"])
     s.add_dependency(%q<rspec>, ["~> 2.5.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])

data/lib/cuken/api/chef.rb

@@ -82,12 +82,12 @@ module ::Cuken
         end
         ckbk_pth_opt = false if no_ckbk_pth_opt.is_a? TrueClass
         in_current_dir do
-          unless chef.client_knife_path
-            chef.client_knife_path = Pathname(chef.local_chef_repo).ascend { |d| h=d+'.chef'+'knife.rb'; break h if h.file? }
+          unless chef.knife_config_file
+            chef.knife_config_file = Pathname(chef.local_chef_repo).ascend { |d| h=d+'.chef'+'knife.rb'; break h if h.file? }
           end
-          raise(RuntimeError, "chef.client_knife_path is required", caller) unless chef.client_knife_path
+          raise(RuntimeError, "chef.knife_config_file is required", caller) unless chef.knife_config_file
         end
-        cmd += " -c #{chef.client_knife_path.expand_path.to_s}" if chef.client_knife_path.expand_path.exist?
+        cmd += " -c #{chef.knife_config_file.expand_path.to_s}" if chef.knife_config_file.expand_path.exist?
         cmd += " -o #{ckbk_pth}" if ckbk_pth_opt
         cmd += " --log_level debug" if chef.knife_debug
         chef.root_dir ||= current_dir

data/lib/cuken/api/chef/common.rb

@@ -10,10 +10,9 @@ module ::Cuken
                       :api_response,
                       :exception,
                       :chef_args,
-                      :client_knife_path,
                       :client_name,
                       :client_private_key_path,
-                      :config_file,
+                      :knife_config_file,
                       :cookbook,
                       :cookbook_paths,
                       :cookbooks_paths,
@@ -84,8 +83,8 @@ module ::Cuken
          @root_dir ||= Pathname.getwd
         end
 
-        def config_file
-          @config_file ||= (chef.root_dir + '/.chef/knife.rb')
+        def knife_config_file
+          @knife_config_file ||= (chef.root_dir + '/.chef/knife.rb')
         end
 
         def make_admin

data/lib/cuken/api/chef/knife.rb

@@ -62,7 +62,7 @@ module ::Cuken
                   :admin => true,
                   :file => chef.client_private_key_path,
                   :no_editor => true,
-                  :config_file => chef.config_file}
+                  :config_file => chef.knife_config_file}
           argv = ['client', 'create', data[:name], '--file', data[:file], '--config', data[:config_file],'--no-editor']
           argv << '--admin' if data[:admin]
           unless Pathname(chef.client_private_key_path).exist?
@@ -77,7 +77,7 @@ module ::Cuken
         def show_client(client_name)
           chef.client_private_key_path = chef.root_dir + "/.chef/#{client_name}.pem"
           data = {:name => client_name,
-                  :config_file => chef.config_file}
+                  :config_file => chef.knife_config_file}
           argv = ['client', 'show', data[:name], '--config', data[:config_file],'--no-editor']
           argv << '--admin' if data[:admin]
           with_args *argv do
@@ -92,7 +92,7 @@ module ::Cuken
                   :no_editor => true,
                   :yes => true,
                   :print_after => true,
-                  :config_file => chef.config_file}
+                  :config_file => chef.knife_config_file}
           argv = ['client', 'delete', data[:name], '--no-editor', '--yes' ]
           with_args *argv do
             ::Chef::Application::Knife.new.run
@@ -110,12 +110,12 @@ module ::Cuken
         end
 
         def node_show(node_name, attr = :all)
-          Pathname(chef.config_file).exist?.should be_true
-          argv = ['node', 'show', node_name, '--no-editor', '--config', chef.config_file]
+          Pathname(chef.knife_config_file).exist?.should be_true
+          argv = ['node', 'show', node_name, '--no-editor', '--config', chef.knife_config_file]
           unless attr == :all
             argv << '--attribute' << attr
           end
-          if Pathname(chef.config_file).exist?
+          if Pathname(chef.knife_config_file).exist?
             with_args *argv do
               ::Chef::Application::Knife.new.run
             end
@@ -126,8 +126,8 @@ module ::Cuken
         end
 
         def node_role_load(hsh)
-          argv = ['node', 'run_list', 'add', hsh[:node], "role[#{hsh[:role]}]", '--no-editor', '--config', chef.config_file]
-          if Pathname(chef.config_file).exist?
+          argv = ['node', 'run_list', 'add', hsh[:node], "role[#{hsh[:role]}]", '--no-editor', '--config', chef.knife_config_file]
+          if Pathname(chef.knife_config_file).exist?
             with_args *argv do
               ::Chef::Application::Knife.new.run
             end
@@ -138,8 +138,8 @@ module ::Cuken
         end
 
         def node_create(node_name)
-          argv = ['node', 'create', node_name, '--no-editor', '--config', chef.config_file]
-          if Pathname(chef.config_file).exist?
+          argv = ['node', 'create', node_name, '--no-editor', '--config', chef.knife_config_file]
+          if Pathname(chef.knife_config_file).exist?
             with_args *argv do
               ::Chef::Application::Knife.new.run
             end

data/lib/cuken/cucumber/chef/knife.rb

@@ -23,7 +23,7 @@ World(::Cuken::Api::Chef::Knife)
 
 Given /^the Knife file "([^"]*)"$/ do |path|
   in_current_dir do
-    chef.client_knife_path = Pathname(path).expand_path.realdirpath
+    chef.knife_config_file = Pathname(path).expand_path.realdirpath
   end
 end
 

metadata

@@ -2,7 +2,7 @@
 name: cuken
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Hedgehog
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 Z
+date: 2011-04-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aruba
@@ -24,41 +24,52 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: chef
+  name: cucumber
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.12
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: grit
+  name: chef
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.4.1
+        version: 0.10.0.rc.0
   type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rvm
+  name: grit
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.2
+        version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: open4
+  name: rvm
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: open4
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,10 +77,21 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: vagrant
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rr
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,10 +99,10 @@ dependencies:
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -88,10 +110,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -99,10 +121,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,10 +132,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -121,10 +143,10 @@ dependencies:
         version: 1.0.11
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -132,10 +154,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -143,10 +165,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: reek
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -154,10 +176,10 @@ dependencies:
         version: 1.2.8
   type: :development
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: roodi
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -165,10 +187,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *id014
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: fakefs
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -176,7 +198,7 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *id015
+  version_requirements: *id017
 description: Reusable Cucumber steps and API for post-convergence system integration descriptions
 email: hedgehogshiatus@gmail.com
 executables: []
@@ -633,7 +655,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1162902324164620948
+      hash: 1954710544561302796
       segments: 
       - 0
       version: "0"