cucumber-chef 2.1.0.rc.2 → 2.1.0.rc.3

data/lib/cucumber/chef/version.rb

@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "2.1.0.rc.2" unless const_defined?(:VERSION)
+    VERSION = "2.1.0.rc.3" unless const_defined?(:VERSION)
 
 ################################################################################
 

data/spec/cucumber/chef/config_spec.rb

@@ -46,8 +46,8 @@ describe Cucumber::Chef::Config do
       Cucumber::Chef::Config[:mode].should == :user
     end
 
-    it "Cucumber::Chef::Config[:provider] defaults to :aws" do
-      Cucumber::Chef::Config[:provider].should == :aws
+    it "Cucumber::Chef::Config.provider defaults to :vagrant" do
+      Cucumber::Chef::Config.provider.should == :vagrant
     end
 
     context "Cucumber::Chef::Config[:aws] default values" do
@@ -112,10 +112,10 @@ describe Cucumber::Chef::Config do
   describe "when configuration is valid" do
 
     it "should allow changing providers" do
-      Cucumber::Chef::Config[:provider] = :aws
+      Cucumber::Chef::Config.provider = :aws
       expect{ Cucumber::Chef::Config.verify_keys }.to_not raise_error(Cucumber::Chef::ConfigError)
 
-      Cucumber::Chef::Config[:provider] = :vagrant
+      Cucumber::Chef::Config.provider = :vagrant
       expect{ Cucumber::Chef::Config.verify_keys }.to_not raise_error(Cucumber::Chef::ConfigError)
     end
 
@@ -131,7 +131,7 @@ describe Cucumber::Chef::Config do
     context "when provider is aws" do
       it "should verify the configuration" do
         user = ENV['OPSCODE_USER'] || ENV['USER']
-        Cucumber::Chef::Config[:provider] = :aws
+        Cucumber::Chef::Config.provider = :aws
         Cucumber::Chef::Config[:aws][:aws_access_key_id] = ENV['AWS_ACCESS_KEY_ID']
         Cucumber::Chef::Config[:aws][:aws_secret_access_key] = ENV['AWS_SECRET_ACCESS_KEY']
         Cucumber::Chef::Config[:aws][:aws_ssh_key_id] = ENV['AWS_SSH_KEY_ID'] || user
@@ -149,7 +149,7 @@ describe Cucumber::Chef::Config do
   describe "when configuration is invalid" do
 
     it "should complain about missing configuration keys" do
-      Cucumber::Chef::Config[:provider] = nil
+      Cucumber::Chef::Config.provider = nil
       expect{ Cucumber::Chef::Config.verify_keys }.to raise_error(Cucumber::Chef::ConfigError)
 
       Cucumber::Chef::Config[:mode] = nil
@@ -157,7 +157,7 @@ describe Cucumber::Chef::Config do
     end
 
     it "should complain about invalid configuration key values" do
-      Cucumber::Chef::Config[:provider] = :awss
+      Cucumber::Chef::Config.provider = :awss
       expect{ Cucumber::Chef::Config.verify_keys }.to raise_error(Cucumber::Chef::ConfigError)
 
       Cucumber::Chef::Config[:mode] = :userr
@@ -167,7 +167,7 @@ describe Cucumber::Chef::Config do
     describe "when provider is aws" do
 
       it "should complain about missing provider configuration keys" do
-        Cucumber::Chef::Config[:provider] = :aws
+        Cucumber::Chef::Config.provider = :aws
         expect{ Cucumber::Chef::Config.verify_provider_keys }.to raise_error(Cucumber::Chef::ConfigError)
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc.2
+  version: 2.1.0.rc.3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -93,13 +93,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.10.0
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,15 +107,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,15 +123,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: ubuntu_ami
   requirement: !ruby/object:Gem::Requirement
@@ -297,7 +297,6 @@ files:
 - features/usage.feature
 - lib/cucumber-chef.rb
 - lib/cucumber/chef.rb
-- lib/cucumber/chef/bootstrap.rb
 - lib/cucumber/chef/config.rb
 - lib/cucumber/chef/helpers.rb
 - lib/cucumber/chef/helpers/chef_client.rb

data/lib/cucumber/chef/bootstrap.rb

@@ -1,95 +0,0 @@
-################################################################################
-#
-#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
-#      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2013 Atalanta Systems Ltd
-#     License: Apache License, Version 2.0
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-#
-################################################################################
-
-module Cucumber
-  module Chef
-
-    class BootstrapError < Error; end
-
-    class Bootstrap
-      attr_accessor :stdout, :stderr, :stdin, :config
-
-################################################################################
-
-      def initialize(stdout=STDOUT, stderr=STDERR, stdin=STDIN)
-        @stdout, @stderr, @stdin = stdout, stderr, stdin
-        @stdout.sync = true if @stdout.respond_to?(:sync=)
-
-        @ssh = ZTK::SSH.new(:stdout => @stdout, :stderr => @stderr, :stdin => @stdin)
-        @config = Hash.new(nil)
-        @config[:context] = Hash.new(nil)
-      end
-
-################################################################################
-
-      def run
-        Cucumber::Chef.logger.debug { "config(#{@config.inspect})" }
-
-        if !@config[:template_file]
-          message = "You must supply a 'template_file' option."
-          Cucumber::Chef.logger.fatal { message }
-          raise BootstrapError, message
-        end
-
-        if !@config[:host]
-          message = "You must supply a 'host' option."
-          Cucumber::Chef.logger.fatal { message }
-          raise BootstrapError, message
-        end
-
-        if !@config[:ssh_user]
-          message = "You must supply a 'ssh_user' option."
-          Cucumber::Chef.logger.fatal { message }
-          raise BootstrapError, message
-        end
-
-        if (!@config[:ssh_password] && !@config[:identity_file])
-          message = "You must supply a 'ssh_password' or 'identity_file' option."
-          Cucumber::Chef.logger.fatal { message }
-          raise BootstrapError, message
-        end
-
-        Cucumber::Chef.logger.debug { "prepare(#{@config[:host]}:#{@config[:port]})" }
-
-        @ssh.config.host_name = @config[:host]
-        @ssh.config.port = @config[:port] if @config[:port]
-        @ssh.config.user = @config[:ssh_user]
-        @ssh.config.password = @config[:ssh_password]
-        @ssh.config.keys = @config[:identity_file]
-        @ssh.config.timeout = 5
-
-        Cucumber::Chef.logger.debug { "template_file(#{@config[:template_file]})" }
-        command = ZTK::Template.render(@config[:template_file], @config[:context])
-        command = "sudo #{command}" if @config[:use_sudo]
-
-        Cucumber::Chef.logger.debug { "begin(#{@config[:host]}:#{@config[:port]})" }
-        @ssh.exec(command, :silence => true)
-        Cucumber::Chef.logger.debug { "end(#{@config[:host]}:#{@config[:port]})" }
-      end
-
-################################################################################
-
-    end
-
-  end
-end
-
-################################################################################