cucumber-chef 2.0.4 → 2.0.5

data/lib/cucumber/chef/templates/cucumber/example_feature.erb

@@ -12,7 +12,7 @@ Feature: Perform test driven infrastructure with Cucumber-Chef
     * the chef-client has been run on "<%= @project %>"
     * I ssh to "<%= @project %>" with the following credentials:
       | username | keyfile |
-      | root | ../.ssh/id_rsa |
+      | root | ./.cucumber-chef/id_rsa-ubuntu |
 
   Scenario: Can connect to the provisioned server via SSH authentication
     When I run "hostname"

data/lib/cucumber/chef/test_lab.rb

@@ -85,7 +85,7 @@ module Cucumber
         if @server
           @stdout.print("Waiting for SSHD...")
           Cucumber::Chef.spinner do
-            Cucumber::Chef::TCPSocket.new(@server.public_ip_address, 22).wait
+            ZTK::TCPSocketCheck.new(:host => @server.public_ip_address, :port => 22).wait
           end
           @stdout.puts("done.\n")
         end
@@ -131,7 +131,7 @@ module Cucumber
 
             @stdout.print("Waiting for SSHD...")
             Cucumber::Chef.spinner do
-              Cucumber::Chef::TCPSocket.new(@server.public_ip_address, 22).wait
+              ZTK::TCPSocketCheck.new(:host => @server.public_ip_address, :port => 22).wait
             end
             @stdout.puts("done.\n")
 
@@ -323,10 +323,12 @@ module Cucumber
           security_group.authorize_port_range(22..22) if port_ranges.none?{ |port_range| port_range === 22 }
           security_group.authorize_port_range(4000..4000) if port_ranges.none?{ |port_range| port_range === 4000 }
           security_group.authorize_port_range(4040..4040) if port_ranges.none?{ |port_range| port_range === 4040 }
+          security_group.authorize_port_range(8787..8787) if port_ranges.none?{ |port_range| port_range === 8787 }
         elsif (security_group = @connection.security_groups.new(:name => security_group_name, :description => "cucumber-chef test lab")).save
           security_group.authorize_port_range(22..22)
           security_group.authorize_port_range(4000..4000)
           security_group.authorize_port_range(4040..4040)
+          security_group.authorize_port_range(8787..8787)
         else
           raise TestLabError, "Could not find an existing or create a new AWS security group."
         end

data/lib/cucumber/chef/utility.rb

@@ -124,6 +124,18 @@ module Cucumber
         warning.join("\n")
       end
 
+################################################################################
+
+      def external_ip
+        %x( wget -q -O - checkip.dyndns.org|sed -e 's/.*Current IP Address: //' -e 's/<.*$//' ).chomp
+      end
+
+      def log_file
+        config_path = File.join(Cucumber::Chef.locate_parent(".chef"), ".cucumber-chef")
+        FileUtils.mkdir_p(config_path)
+        File.join(config_path, "cucumber-chef.log")
+      end
+
 ################################################################################
 
     end

data/lib/cucumber/chef/version.rb

@@ -24,7 +24,7 @@ module Cucumber
 
 ################################################################################
 
-    VERSION = "2.0.4" unless const_defined?(:VERSION)
+    VERSION = "2.0.5" unless const_defined?(:VERSION)
 
 ################################################################################
 

data/spec/spec_helper.rb

@@ -22,7 +22,7 @@
 require 'cucumber-chef'
 
 dev_null = File.open("/dev/null", "w")
-$logger = Cucumber::Chef::Logger.new(dev_null)
+$logger = ZTK::Logger.new(dev_null)
 
 require 'simplecov'
 SimpleCov.start do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-chef
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -45,13 +45,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,15 +59,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,15 +75,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: net-sftp
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 0.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,15 +91,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,15 +107,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: ubuntu_ami
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 0.4.0
   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.4.0
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,15 +139,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: ztk
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,31 +155,31 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ubuntu_ami
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
+        version: 0.6.4
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,15 +187,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -203,9 +203,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -227,8 +227,9 @@ email:
 executables:
 - cc-console
 - cc-knife
+- cc-push
+- cc-server
 - cucumber-chef
-- push-cucumber-chef
 extensions: []
 extra_rdoc_files: []
 files:
@@ -244,8 +245,9 @@ files:
 - TODO.md
 - bin/cc-console
 - bin/cc-knife
+- bin/cc-push
+- bin/cc-server
 - bin/cucumber-chef
-- bin/push-cucumber-chef
 - chef_repo/cookbooks/cucumber-chef/LICENSE
 - chef_repo/cookbooks/cucumber-chef/README.md
 - chef_repo/cookbooks/cucumber-chef/attributes/default.rb
@@ -279,7 +281,6 @@ files:
 - lib/cucumber-chef.rb
 - lib/cucumber/chef.rb
 - lib/cucumber/chef/bootstrap.rb
-- lib/cucumber/chef/command.rb
 - lib/cucumber/chef/config.rb
 - lib/cucumber/chef/helpers.rb
 - lib/cucumber/chef/helpers/chef_client.rb
@@ -290,16 +291,12 @@ files:
 - lib/cucumber/chef/helpers/server.rb
 - lib/cucumber/chef/helpers/test_lab.rb
 - lib/cucumber/chef/helpers/utility.rb
-- lib/cucumber/chef/logger.rb
 - lib/cucumber/chef/provisioner.rb
-- lib/cucumber/chef/ssh.rb
 - lib/cucumber/chef/steps.rb
 - lib/cucumber/chef/steps/chef_steps.rb
 - lib/cucumber/chef/steps/minitest_steps.rb
 - lib/cucumber/chef/steps/provision_steps.rb
 - lib/cucumber/chef/steps/ssh_steps.rb
-- lib/cucumber/chef/tcp_socket.rb
-- lib/cucumber/chef/template.rb
 - lib/cucumber/chef/templates/bootstrap/ubuntu-precise-test-lab.erb
 - lib/cucumber/chef/templates/cucumber-chef/config-rb.erb
 - lib/cucumber/chef/templates/cucumber-chef/cucumber-yml.erb
@@ -312,7 +309,6 @@ files:
 - lib/cucumber/chef/templates/cucumber/readme-roles.erb
 - lib/cucumber/chef/templates/cucumber/readme.erb
 - lib/cucumber/chef/test_lab.rb
-- lib/cucumber/chef/test_runner.rb
 - lib/cucumber/chef/utility.rb
 - lib/cucumber/chef/version.rb
 - spec/cucumber/chef/config_spec.rb
@@ -358,3 +354,4 @@ test_files:
 - spec/cucumber/chef/provisioner_spec.rb
 - spec/cucumber/chef/test_lab_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/bin/push-cucumber-chef

@@ -1,38 +0,0 @@
-#!/usr/bin/env ruby
-require 'cucumber-chef'
-
-def run(command)
-  puts "Executing: '#{command}'"
-  @ssh.exec(command)
-end
-
-$logger = Cucumber::Chef::Logger.new
-$logger.level = (Cucumber::Chef.is_rc? ? Cucumber::Chef::Logger::DEBUG : Cucumber::Chef::Logger::INFO)
-
-message = "push-cucumber-chef v#{Cucumber::Chef::VERSION}"
-puts(message)
-$logger.info { message }
-
-Cucumber::Chef::Config.load
-if (test_lab = Cucumber::Chef::TestLab.new) && (test_lab.labs_running.count > 0)
-  @ssh = Cucumber::Chef::SSH.new
-  @ssh.config[:host] = test_lab.labs_running.first.public_ip_address
-  @ssh.config[:ssh_user] = "ubuntu"
-  @ssh.config[:identity_file] = Cucumber::Chef.locate(:file, ".cucumber-chef", "id_rsa-#{@ssh.config[:ssh_user]}")
-
-  gem_name = "cucumber-chef-#{Cucumber::Chef::VERSION}.gem"
-
-  puts %x(cd #{Cucumber::Chef.root} && gem build cucumber-chef.gemspec -V)
-
-  local_file = File.join(Cucumber::Chef.root, gem_name)
-  remote_file = File.join("/", "home", @ssh.config[:ssh_user], gem_name)
-  puts("#{local_file} -> #{@ssh.config[:ssh_user]}@#{test_lab.labs_running.first.public_ip_address}:#{remote_file}")
-  @ssh.upload(local_file, remote_file)
-  FileUtils.rm_f(File.join(Cucumber::Chef.root, "*.gem"))
-
-  run("cd #{File.dirname(remote_file)}; ls -la | grep 'cucumber-chef-'; sudo gem uninstall cucumber-chef -a -I -x -V; sudo gem install #{gem_name} -l -V; rm -f *.gem")
-
-else
-  puts("No running cucumber-chef test labs to connect to!")
-  exit(1)
-end

data/lib/cucumber/chef/command.rb

@@ -1,78 +0,0 @@
-################################################################################
-#
-#      Author: Stephen Nelson-Smith <stephen@atalanta-systems.com>
-#      Author: Zachary Patten <zachary@jovelabs.com>
-#   Copyright: Copyright (c) 2011-2012 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 CommandError < Error; end
-
-    class Command
-      attr_accessor :stdout, :stderr, :stdin
-
-################################################################################
-
-      def initialize(stdout=STDOUT, stderr=STDERR, stdin=STDIN)
-        @stdout, @stderr, @stdin = stdout, stderr, stdin
-        @stdout.sync = true if @stdout.respond_to?(:sync=)
-
-        @knife = (Cucumber::Chef.locate(:file, "bin", "knife") rescue nil)
-        @knife = "/usr/bin/env knife" unless @knife
-      end
-
-################################################################################
-
-      def run(command, options={})
-        options = { :exit_code => 0, :silence => false }.merge(options)
-        exit_code = options[:exit_code]
-        silence = options[:silence]
-        $logger.debug { "options(#{options.inspect})" }
-
-        command = "#{command} 2>&1"
-        $logger.debug { "command(#{command})" }
-        output = %x( #{command} )
-        $logger.debug { "exit_code(#{$?})" }
-
-        $logger.debug { "--------------------------------------------------------------------------------" }
-        $logger.debug { output }
-        $logger.debug { "--------------------------------------------------------------------------------" }
-
-        @stdout.puts(output) if !silence
-
-        raise CommandError, "run(#{command}) failed! [#{$?}]" if ($? != exit_code)
-
-        output
-      end
-
-################################################################################
-
-      def knife(command, options={})
-        knife_rb = File.expand_path(File.join(Dir.pwd, ".cucumber-chef", "knife.rb"))
-        run("#{@knife} #{command.flatten.compact.join(" ")} -c #{knife_rb}  --color -n", options)
-      end
-
-################################################################################
-
-    end
-
-  end
-end
-
-################################################################################