skewer 0.1.0 → 0.1.1

data/.idea/skewer.iml

@@ -5,57 +5,60 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="Saikuro (v1.1.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activesupport (v3.2.2, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activesupport (v3.2.3, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="archive-tar-minitar (v0.5.2, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="arrayfields (v4.7.4, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="aruba (v0.4.11, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="builder (v3.0.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.1.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.1.3, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="childprocess (v0.3.1, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="chronic (v0.3.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="churn (v0.0.13, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="churn (v0.0.15, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="colored (v1.2, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="cucumber (v1.1.9, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.1.3, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="excon (v0.9.6, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="fattr (v2.2.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ffi (v1.0.11, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="flay (v1.4.3, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="flog (v2.5.3, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="fog (v1.1.2, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="formatador (v0.2.1, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="gherkin (v2.9.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gherkin (v2.9.3, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="git (v1.2.5, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="hirb (v0.6.1, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="hirb (v0.5.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v0.6.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jeweler (v1.8.3, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v1.5.4, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json_pure (v1.6.5, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="log4r (v1.1.10, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v1.6.1, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json_pure (v1.6.6, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="main (v4.7.1, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="map (v4.3.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mario (v0.0.6, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="metric_fu (v2.1.1, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="mime-types (v1.17.2, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mime-types (v1.18, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.0.4, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="net-scp (v1.0.4, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="net-ssh (v2.2.2, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.5.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="progressbar (v0.10.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="net-ssh (v2.3.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.5.2, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="progressbar (v0.11.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rails_best_practices (v1.9.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v0.9.2.2, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rcov (v1.0.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rdoc (v3.12, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="reek (v1.2.8, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="roodi (v2.1.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v2.8.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.8.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.8.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.8.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v2.9.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v2.9.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v2.9.1, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v2.9.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-hmac (v0.4.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby2ruby (v1.3.1, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby_parser (v2.0.6, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="sexp_processor (v3.0.10, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby_parser (v2.3.1, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="sexp_processor (v3.0.7, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="syntax (v1.0.0, RVM: ruby-1.8.7-p352) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="term-ansicolor (v1.0.7, RVM: ruby-1.8.7-p352) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="vagrant (v0.9.7, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="vagrant (v1.0.2, RVM: ruby-1.8.7-p352) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="virtualbox (v0.7.5, RVM: ruby-1.8.7-p352) [gem]" level="application" />
   </component>
 </module>
 

data/Gemfile.lock

@@ -1,17 +1,18 @@
 PATH
   remote: .
   specs:
-    skewer (0.0.1)
+    skewer (0.1.0)
       fog (~> 1.1.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
     Saikuro (1.1.0)
-    activesupport (3.2.2)
+    activesupport (3.2.3)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
+    arrayfields (4.7.4)
     aruba (0.4.11)
       childprocess (>= 0.2.3)
       cucumber (>= 1.1.1)
@@ -21,12 +22,22 @@ GEM
     childprocess (0.3.1)
       ffi (~> 1.0.6)
     chronic (0.3.0)
-    churn (0.0.13)
+    churn (0.0.15)
+      arrayfields (= 4.7.4)
       chronic (>= 0.2.3)
+      chronic (>= 0.2.3)
+      fattr (= 2.2.0)
+      hirb (= 0.5.0)
       hirb
+      jeweler (= 1.6.4)
+      json (= 1.6.1)
       json_pure
       main
-      ruby_parser (~> 2.0.4)
+      main (>= 4.6.0)
+      map (= 4.3.0)
+      ruby_parser (= 2.3.1)
+      ruby_parser (~> 2.3)
+      sexp_processor (= 3.0.7)
       sexp_processor (~> 3.0.3)
     colored (1.2)
     cucumber (1.1.9)
@@ -38,6 +49,7 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.7.0)
     excon (0.9.6)
+    fattr (2.2.0)
     ffi (1.0.11)
     flay (1.4.3)
       ruby_parser (~> 2.0)
@@ -56,20 +68,20 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.1)
-    gherkin (2.9.0)
+    gherkin (2.9.3)
       json (>= 1.4.6)
     git (1.2.5)
-    hirb (0.6.1)
+    hirb (0.5.0)
     i18n (0.6.0)
-    jeweler (1.8.3)
+    jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-      rdoc
-    json (1.5.4)
-    json_pure (1.6.5)
-    log4r (1.1.10)
+    json (1.6.1)
+    json_pure (1.6.6)
     main (4.7.1)
+    map (4.3.0)
+    mario (0.0.6)
     metric_fu (2.1.1)
       Saikuro (>= 1.1.0)
       activesupport (>= 2.0.0)
@@ -82,13 +94,13 @@ GEM
       reek (>= 1.2.6)
       roodi (>= 2.1.0)
       syntax
-    mime-types (1.17.2)
+    mime-types (1.18)
     multi_json (1.0.4)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.2.2)
-    nokogiri (1.5.0)
-    progressbar (0.10.0)
+    net-ssh (2.3.0)
+    nokogiri (1.5.2)
+    progressbar (0.11.0)
     rails_best_practices (1.9.0)
       activesupport
       colored
@@ -98,40 +110,39 @@ GEM
       sexp_processor
     rake (0.9.2.2)
     rcov (1.0.0)
-    rdoc (3.12)
-      json (~> 1.4)
     reek (1.2.8)
       ruby2ruby (~> 1.2)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
     roodi (2.1.0)
       ruby_parser
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     ruby-hmac (0.4.0)
     ruby2ruby (1.3.1)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.0.6)
+    ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.10)
+    sexp_processor (3.0.7)
     syntax (1.0.0)
     term-ansicolor (1.0.7)
-    vagrant (0.9.7)
+    vagrant (0.5.4)
       archive-tar-minitar (= 0.5.2)
-      childprocess (~> 0.3.1)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6.0)
-      json (~> 1.5.1)
-      log4r (~> 1.1.9)
-      net-scp (~> 1.0.4)
-      net-ssh (~> 2.2.2)
+      erubis (>= 2.6.6)
+      json (>= 1.4.3)
+      mario (~> 0.0.6)
+      net-scp (>= 1.0.2)
+      net-ssh (>= 2.0.19)
+      virtualbox (~> 0.7.3)
+    virtualbox (0.7.5)
+      ffi (>= 0.6.3)
 
 PLATFORMS
   ruby
@@ -143,4 +154,4 @@ DEPENDENCIES
   rcov (~> 1.0.0)
   rspec
   skewer!
-  vagrant (~> 0.9.0)
+  vagrant

data/Rakefile

@@ -8,7 +8,7 @@ require 'metric_fu'
 require 'rake'
 require 'rake/clean'
 require 'rspec/core/rake_task'
-require 'vagrant'
+#require 'vagrant'
 
 CLEAN.include ['coverage', 'target', '/tmp/skewer_test_code', '/tmp/more_skewer_test_code', '.skewer.json', '/tmp/skewer*']
 
@@ -56,4 +56,4 @@ RSpec::Core::RakeTask.new("spec:coverage") do |t|
 end
 
 task :default => [:clean, :spec]
-task :features => :vagrant_up
+#task :features => :vagrant_up

data/assets/rubygems.sh

@@ -33,7 +33,7 @@ EOF
 
 chmod 0755 /etc/profile.d/rubygems.sh
 . /etc/profile.d/rubygems.sh
-aptitude update >/dev/null
-aptitude install -y rsync ruby rubygems libopenssl-ruby ruby-dev build-essential libxml2-dev libxslt-dev
+apt-get update >/dev/null
+apt-get install -y rsync ruby rubygems libopenssl-ruby ruby-dev build-essential libxml2-dev libxslt-dev
 gem install bundler --no-rdoc --no-ri
 gem install json --no-rdoc --no-ri

data/bin/skewer

@@ -23,7 +23,6 @@ optparse = OptionParser.new do |opts|
 
   opts.on('-pc', '--puppetcode') do |pc|
     options[:puppet_repo] = pc
-    puts "puppetcode is: " + pc
   end
 
   opts.on('-m', '--mock') do

data/features/hooks.feature

@@ -3,13 +3,27 @@ Feature: Hooks
   As a user
   I want it to execute a command when it's finihsed
 
-Scenario: accept hook on CLI
-  Given a file named "/tmp/skewer_hook" with:
-  """
-  #!/bin/bash
-  echo $1 > /tmp/skewer_hook_result
-  """
-  And I run `chmod +x /tmp/skewer_hook`
-  When I run `./bin/skewer provision --cloud stub --image foo --role bar --hook /tmp/skewer_hook`
-  Then the file "/tmp/skewer_hook_result" should exist
+  Scenario: accept hook on CLI
+    Given a file named "/tmp/skewer_hook" with:
+    """
+    #!/bin/bash
+    echo $1 > /tmp/skewer_hook_result
+    """
+    And I run `chmod +x /tmp/skewer_hook`
+    When I run `./bin/skewer provision --cloud stub --image foo --role bar --hook /tmp/skewer_hook`
+    Then the file "/tmp/skewer_hook_result" should exist
+
+
+  Scenario: run cucumber on completion
+    Given I have puppet code in "/tmp/skewer_test_code"
+    When I run `./bin/skewer provision --cloud ec2 --role apache --image ami-5c9b4935  --key testytesty  --puppetcode /tmp/skewer_test_code  --features hook-test/features`
+    Then the exit status should be 0
+    And the stdout should contain "Puppet run succeeded"
+
+#@announce-stdout
+#@announce-stderr
+Scenario: failed cucumber should fail the run
+    Given I have puppet code in "/tmp/skewer_test_code"
+    When I run `./bin/skewer provision --cloud stub --role foobar --image ami-5c9b4935  --key testytesty  --puppetcode /tmp/skewer_test_code  --features hook-test/features`
+    Then the exit status should not be 0
 

data/features/rackspace.feature

@@ -3,8 +3,7 @@ Feature: provisioning a node on Rackspace
   As someone who wants to deploy something to the machine
   I want to run the provision command
 
-  @announce-stdout
-  @announce-stderr
+
   Scenario: config in local file
     Given I have puppet code in "/tmp/skewer_test_code"
     And a file named ".skewer.json" with:
@@ -15,20 +14,21 @@ Feature: provisioning a node on Rackspace
     "image_id":"112"
     }
     """
-    When I run `./bin/skewer provision --cloud rackspace --role foobar --image 112`
+    When I run `./bin/skewer provision --cloud rackspace --role foobar --image 112 --region lon`
     Then the stdout should contain "Evaluating cloud rackspace"
     And the stdout should contain "Launching a Rackspace node"
+    And the exit status should be 0
+
 
-  @announce-stdout
-  @announce-stderr
   Scenario: Build a machine with a specific flavor (RAM size)
-    Given I run `./bin/skewer provision --cloud rackspace --role foobar --image 112 --flavor 3`
+    Given I run `./bin/skewer provision --cloud rackspace --role foobar --image 112 --flavor 3  --puppetcode /tmp/skewer_test_code --region lon`
     Then the stdout should contain "Evaluating cloud rackspace"
     And the stdout should contain "Launching a Rackspace node"
+    And the exit status should be 0
+
 
-  @announce-stdout
-  @announce-stderr
   Scenario: Build a machine with a symbolic image ID
-    Given I run `./bin/skewer provision --cloud rackspace --role foobar --image ubuntu1104 --flavor 2`
+    Given I run `./bin/skewer provision --cloud rackspace --role foobar --image ubuntu1104 --flavor 2 --puppetcode /tmp/skewer_test_code --region lon`
     Then the stdout should contain "Evaluating cloud rackspace"
     And the stdout should contain "Launching a Rackspace node"
+    And the exit status should be 0

data/features/support/puppetcode/manifests/classes/apache.pp

@@ -0,0 +1,3 @@
+class apache {
+  include apache::install
+}

data/features/support/puppetcode/manifests/site.pp

@@ -1,2 +1,3 @@
-import "nodes.pp"
 import "classes/*.pp"
+import "nodes.pp"
+

data/features/support/puppetcode/modules/apache/manifests/install.pp

@@ -0,0 +1,16 @@
+class apache::install {
+  package {
+    'apache2': ensure => present
+  }
+  file {
+    '/var/www/index.html':
+      ensure => present,
+      content => 'Puppet Run Success',
+      require => Package['apache2'];
+  }
+  service {
+    'apache2':
+      ensure => running,
+      require => Package['apache2'];
+  }
+}

data/features/update.feature

@@ -7,6 +7,7 @@ Scenario: run the command without args
   When I run `./bin/skewer update`
   Then the exit status should not be 0
 
+@wip
 @announce-stdout @announce-stderr
 Scenario: pass in a hostname user and role on passing puppet code
   Given I have access to the internet
@@ -16,13 +17,13 @@ Scenario: pass in a hostname user and role on passing puppet code
   And the stdout should contain "Using Puppet Code from /tmp/skewer_test_code/"
   And the stdout should contain "Puppet run succeeded"
 
-
+@wip
 @announce-stdout @announce-stderr
 Scenario: pass in a hostname user and role on broken puppet code
   Given I have access to the internet
   And I have puppet code in "/tmp/skewer_test_code"
   When I run `./bin/skewer update --host default --user vagrant --role foobroken --puppetcode /tmp/skewer_test_code/`
-  Then the exit status should be 0
+  Then the exit status should not be 0
   And the stdout should contain "Using Puppet Code from /tmp/skewer_test_code/"
   And the stdout should contain "Puppet failed"
 

data/hook-test/Gemfile

@@ -0,0 +1,6 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gem "capybara"
+gem "cucumber"
+gem "culerity"

data/hook-test/features/default_web_page.feature

@@ -0,0 +1,9 @@
+Feature: apache
+  In order to server content
+  As an administrator of the website
+  I would like there to be an apache server
+
+Scenario: default web page
+  Given I visit a page on the root domain
+  Then I should see 'Puppet Run Success'
+

data/hook-test/features/step_definitions/steps.rb

@@ -0,0 +1,9 @@
+Given /^I visit a page on the root domain$/ do
+  fail unless host = ENV['SKEWER_HOST']
+  @page = `curl -s "http://#{host}/"`
+end
+
+
+Then /^I should see '(.*)'$/ do |arg|
+  @page.should match(/#{arg}/)
+end

data/hook-test/features/support/env.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'bundler'
+

data/lib/bootstrapper.rb

@@ -60,7 +60,7 @@ module Skewer
       # TODO: if there's no role, it should look it up from an external source
       if @mock
         Skewer.logger.debug "Mock: would normally rsync now"
-      else
+        else
         Source.new(source_dir).rsync(@node)
       end
 

data/lib/cli.rb

@@ -34,7 +34,7 @@ module Skewer
         when :rackspace
           require 'rackspace/node'
           Skewer.logger.debug 'Launching a Rackspace node'
-          node = Rackspace::Node.new(@options[:flavor_id], image, 'default').node
+          node = Rackspace::Node.new(@config.get('flavor_id'), image, 'default').node
         when :linode
           raise "not implemented"
         when :eucalyptus
@@ -78,10 +78,12 @@ module Skewer
         Puppet.run(node, @options)
         location = @util.get_location(node)
         Hooks.new(location).run
+
+        Cuke.new(@config.get(:cuke_dir), location).run if @config.get(:cuke_dir)
         Skewer.logger.debug "Node ready\n open http://#{location} or \n ssh -l #{node.username} #{location}"
-        Cuke.new(@config.get(:cuke_dir)).run if @config.get(:cuke_dir)
       rescue Exception => exception
         Skewer.logger.debug exception
+        raise "Something went wrong, and we killed the node"
       ensure
         destroy
       end

data/lib/cuke.rb

@@ -6,18 +6,18 @@ module Skewer
   # built.
   class Cuke
     class CukeError < RuntimeError; end
+    include Skewer
 
-    def initialize(dir = nil)
-      raise "you must provide a valid directory for features to be executed within" if dir.nil? or dir.class != String or  !directory_exists?(dir)
+    def initialize(dir = nil, host = nil)
+      raise "you must provide a valid directory for features to be executed within" unless File.directory?(dir)
       @dir = dir
-    end
-
-    def directory_exists?(dir)
-      File.directory?(dir)
+      @host = host
     end
 
     def run
-      result = `cucumber #{@dir}`
+      Skewer.logger.debug("Running cucumber hook")
+      `cd #{@dir}/.. && bundle install` if File.join(@dir, '..', 'Gemfile')
+      result = `cucumber #{@dir} SKEWER_HOST=#{@host}`
       parsed = result.match(/failed/)[0] rescue false
       raise CukeError, "One of the cuke features failed!\n\n#{result}" if parsed
       result

data/lib/parser.rb

@@ -13,6 +13,9 @@ module Skewer
         validate_options(options, type)
 
         if type == 'delete'
+          if options[:region]
+            SkewerConfig.set 'region', options[:region]
+          end
           case options[:kind]
             when :ec2
               node = AWS::Node.find_by_name(options[:host])

data/lib/rackspace/images.rb

@@ -1,10 +1,10 @@
 module Skewer
   module Rackspace
     class Images
-      attr_reader :supported
+      attr_reader :distributions
 
       def initialize
-        @supported = {
+        @distributions = {
           'ubuntu1004' => { :id => 112, :name => "Ubuntu 10.04 LTS"},
           'ubuntu1104' => { :id => 115, :name => "Ubuntu 11.04"},
           'ubuntu1110' => { :id => 119, :name => "Ubuntu 11.10"},
@@ -13,12 +13,23 @@ module Skewer
 
       # If provided a name for an image, give back the ID.
       def get_id(name)
-        return @supported['ubuntu1004'][:id] if name.nil?
+        if name.nil?
+          return @distributions['ubuntu1004'][:id]
+        end
         name = Integer(name) rescue name
-        return name if name.class == Fixnum
-        return @supported['ubuntu1004'][:id] if name.class != String
-        raise "An image with the name '#{name}' doesn't exist" if !@supported.has_key?(name)
-        @supported[name][:id]
+
+        if name.class == Fixnum
+          return name
+        end
+
+        unless name.class == String
+          return @distributions['ubuntu1004'][:id]
+        end
+
+        unless @distributions.has_key?(name)
+          raise "An image with the name '#{name}' doesn't exist"
+        end
+        @distributions[name][:id]
       end
     end
   end

data/lib/rackspace/node.rb

@@ -1,5 +1,7 @@
 require 'fog'
 require 'rackspace/images'
+require 'rackspace/service'
+require 'config'
 
 module Skewer
   module Rackspace
@@ -9,42 +11,51 @@ module Skewer
 
       # By default, boot an Ubuntu 10.04 LTS (lucid) server.
       def initialize(flavor = 1, image = 112, name = 'my_server', instance = nil)
-        connection = self.class.find_service
+        region = SkewerConfig.get('region')
+        connection = self.class.find_service(region)
 
         # Get our SSH key to attach it to the server.
-        if instance
-          @node = instance
-        else
-          @node = build(connection, flavor, image, name)
-        end
+        instance ? @node = instance : @node = build(connection, flavor, image, name)
       end
 
-      def self.find_service
-        Fog::Compute.new(
-          :provider => 'Rackspace',
-          :rackspace_api_key => Fog.credentials[:rackspace_api_key],
-          :rackspace_username => Fog.credentials[:rackspace_username],
-          :rackspace_auth_url => "lon.auth.api.rackspacecloud.com")
+      def self.find_service(short_region = 'usa')
+        Skewer::Rackspace::Service.new(short_region).build
       end
 
       def build(connection, flavor, image, name)
-        path = File.expand_path '~/.ssh/id_rsa.pub'
-        path = File.expand_path '~/.ssh/id_dsa.pub' if not File.exist? path
-        raise "Couldn't find a public key" if not File.exist? path
-        key = File.open(path, 'rb').read
+        key = find_key()
 
-        images = Rackspace::Images.new
+        images = Skewer::Rackspace::Images.new
+        image_id = images.get_id(image)
         options = {
           :flavor_id  => flavor,
-          :image_id   => images.get_id(image),
+          :image_id   => image_id,
           :name       => name,
           :public_key => key
         }
-        connection.servers.bootstrap(options)
+        begin
+          connection.servers.bootstrap(options)
+        rescue Fog::Compute::Rackspace::NotFound
+          raise "Sorry, it looks like there's no such Image Id as #{image_id}"
+        end
+      end
+
+      def find_key
+        ssh_key = nil
+        ['id_rsa.pub', 'id_dsa.pub', "#{SkewerConfig.instance.get(:key_name)}.pub"].each do |key|
+          key_path =  File.expand_path(File.join(ENV['HOME'],'.ssh', key))
+          if File.exist?(key_path)
+            ssh_key = key_path
+            break
+          end
+        end
+
+        raise "Couldn't find a public key" unless ssh_key
+        File.read(ssh_key)
       end
 
       def destroy
-        @node.destroy if !@node.nil?
+        @node.destroy unless @node.nil?
       end
 
       def self.find_by_ip(ip_address, service = self.find_service())

data/lib/rackspace/service.rb

@@ -0,0 +1,23 @@
+module Skewer
+  module Rackspace
+    class Service
+      def initialize(short_region_name)
+        @region = region(short_region_name)
+      end
+
+      def region(short_region_name = nil)
+        short_region_name.to_s == 'lon' ? "lon.auth.api.rackspacecloud.com" :
+            "auth.api.rackspacecloud.com"
+      end
+
+      def build
+        Fog::Compute.new(
+            :provider => 'Rackspace',
+            :rackspace_api_key => Fog.credentials[:rackspace_api_key],
+            :rackspace_username => Fog.credentials[:rackspace_username],
+            :rackspace_auth_url => @region)
+      end
+
+    end
+  end
+end

data/lib/skewer/version.rb

@@ -1,3 +1,3 @@
 module Skewer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/source.rb

@@ -37,7 +37,6 @@ module Skewer
     end
 
     def rsync(node)
-      Skewer.logger.debug rsync_command(node)
       location = @util.get_location(node)
       Skewer.logger.debug "Copying code to #{location} ..."
       create_destination(node)

data/skewer.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'metric_fu'
   s.add_development_dependency 'rcov', '~> 1.0.0'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'vagrant', '~> 0.9.0'
+  s.add_development_dependency 'vagrant'
 
   s.files         = `git ls-files`.split("\n").reject {|path| path =~ /\.gitignore$/ }
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/bootstrapper_spec.rb

@@ -106,7 +106,7 @@ describe Skewer::Bootstrapper do
 
   it "should actually run the source step" do
     node  = stub('node')
-    node.should_receive(:username).at_least(3).times
+    node.should_receive(:username).at_least(2).times
     node.should_receive(:ssh)
     bootstrapper = Skewer::Bootstrapper.new(node, {:role => 'foo'})
     lambda {

data/spec/cuke_spec.rb

@@ -3,22 +3,11 @@ require 'cuke'
 
 describe Skewer::Cuke do
   it "should only accept valid directories for construction" do
-    lambda {
-      Skewer::Cuke.new(nil)
-    }.should raise_exception(RuntimeError, "you must provide a valid directory for features to be executed within")
-
-    lambda {
-      Skewer::Cuke.new(123)
-    }.should raise_exception(RuntimeError, "you must provide a valid directory for features to be executed within")
 
     lambda {
       Skewer::Cuke.new('')
     }.should raise_exception(RuntimeError, "you must provide a valid directory for features to be executed within")
 
-    lambda {
-      Skewer::Cuke.new(123)
-    }.should raise_exception(RuntimeError, "you must provide a valid directory for features to be executed within")
-
     lambda {
       Skewer::Cuke.new('./spec/dir_that_doenst_exist')
     }.should raise_exception(RuntimeError, "you must provide a valid directory for features to be executed within")

data/spec/rackspace/images_spec.rb

@@ -12,7 +12,7 @@ describe Skewer::Rackspace::Images do
   end
 
   it "should have a supported images hash associated with the hash" do
-    @images.supported.class.should == Hash
+    @images.distributions.class.should == Hash
   end
 
   it "should provide a default image ID if bad input provided" do

data/spec/rackspace/node_spec.rb

@@ -21,10 +21,9 @@ describe Skewer::Rackspace::Node do
   end
 
   it "should have a delete method" do
-
     node = stub('node')
     node.should_receive(:delete).and_return(true)
     Skewer::Rackspace::Node.new(nil, nil, nil,node).node.delete.should == true
-
   end
+
 end

data/spec/rackspace/service_spec.rb

@@ -0,0 +1,19 @@
+require "rspec"
+require 'rackspace/service'
+
+describe "Rackspace::Service" do
+
+  it "should return the london endpoint if you ask for lon" do
+    Skewer::Rackspace::Service.new(nil).region('lon').should == 'lon.auth.api.rackspacecloud.com'
+    Skewer::Rackspace::Service.new(nil).region(:lon).should == 'lon.auth.api.rackspacecloud.com'
+  end
+
+  it "should default to the US endpoint" do
+    Skewer::Rackspace::Service.new(nil).region().should == 'auth.api.rackspacecloud.com'
+  end
+
+  it "should even give you the US endpoint if something else leaks" do
+    Skewer::Rackspace::Service.new(nil).region('us-east-1').should == 'auth.api.rackspacecloud.com'
+  end
+
+end

data/spec/source_spec.rb

@@ -18,7 +18,7 @@ describe Skewer::Source do
   it "should make a parent directory to shut rsync up" do
     node = mock('node')
     node.should_receive(:dns_name).at_least(3).times.and_return('this.should.not.resolve')
-    node.should_receive(:username).at_least(3).times.and_return('jimmy')
+    node.should_receive(:username).at_least(2).times.and_return('jimmy')
     node.should_receive(:ssh)
     source = Skewer::Source.new('/tmp/')
     lambda { source.rsync(node) }.should raise_exception RuntimeError

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: skewer
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Julian Simpson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-23 00:00:00 Z
+date: 2012-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog
@@ -112,14 +112,12 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 3
         segments: 
         - 0
-        - 9
-        - 0
-        version: 0.9.0
+        version: "0"
   type: :development
   version_requirements: *id007
 description: Runs masterless puppet code on cloud machines
@@ -158,14 +156,20 @@ files:
 - features/step_definitions/cucumber_steps.rb
 - features/step_definitions/delete.rb
 - features/support/env.rb
+- features/support/puppetcode/manifests/classes/apache.pp
 - features/support/puppetcode/manifests/classes/foobar.pp
 - features/support/puppetcode/manifests/classes/foobroken.pp
 - features/support/puppetcode/manifests/classes/role.pp
 - features/support/puppetcode/manifests/site.pp
+- features/support/puppetcode/modules/apache/manifests/install.pp
 - features/support/puppetcode/modules/foo/manifests/bar.pp
 - features/support/puppetcode/modules/foo/manifests/broken.pp
 - features/support/puppetcode/modules/puppet/manifests/munge.pp
 - features/update.feature
+- hook-test/Gemfile
+- hook-test/features/default_web_page.feature
+- hook-test/features/step_definitions/steps.rb
+- hook-test/features/support/env.rb
 - lib/aws/node.rb
 - lib/aws/security_group.rb
 - lib/aws/service.rb
@@ -185,6 +189,7 @@ files:
 - lib/puppet_runtime_error.rb
 - lib/rackspace/images.rb
 - lib/rackspace/node.rb
+- lib/rackspace/service.rb
 - lib/skewer.rb
 - lib/skewer/version.rb
 - lib/source.rb
@@ -207,6 +212,7 @@ files:
 - spec/puppet_node_spec.rb
 - spec/rackspace/images_spec.rb
 - spec/rackspace/node_spec.rb
+- spec/rackspace/service_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb
 - spec/support/features/example.feature
@@ -244,7 +250,7 @@ rubyforge_project: skewer
 rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: skewer-0.1.0
+summary: skewer-0.1.1
 test_files: 
 - features/aws.feature
 - features/bootstrapper.feature
@@ -257,10 +263,12 @@ test_files:
 - features/step_definitions/cucumber_steps.rb
 - features/step_definitions/delete.rb
 - features/support/env.rb
+- features/support/puppetcode/manifests/classes/apache.pp
 - features/support/puppetcode/manifests/classes/foobar.pp
 - features/support/puppetcode/manifests/classes/foobroken.pp
 - features/support/puppetcode/manifests/classes/role.pp
 - features/support/puppetcode/manifests/site.pp
+- features/support/puppetcode/modules/apache/manifests/install.pp
 - features/support/puppetcode/modules/foo/manifests/bar.pp
 - features/support/puppetcode/modules/foo/manifests/broken.pp
 - features/support/puppetcode/modules/puppet/manifests/munge.pp
@@ -281,6 +289,7 @@ test_files:
 - spec/puppet_node_spec.rb
 - spec/rackspace/images_spec.rb
 - spec/rackspace/node_spec.rb
+- spec/rackspace/service_spec.rb
 - spec/source_spec.rb
 - spec/spec_helper.rb
 - spec/support/features/example.feature