blimpy 0.3.5 → 0.3.6

data/README.md

@@ -49,10 +49,12 @@ Here's an example Blimpfile:
     Blimpy.fleet do |fleet|
         fleet.add(:aws) do |ship|
             ship.name = 'rails-app'
-            ship.image_id = 'ami-349b495d' # optional, defaults to Ubuntu 10.04 64-bit
-            ship.livery = 'rails' # optional
-            ship.group = 'Simple' # [Required] The name of the desired Security Group
-            ship.region = 'us-west-1' # optional, defaults to us-west-2
+            ship.ports = [22, 80, 8080] # [Optional] Create a security group with these ports open
+            ship.image_id = 'ami-349b495d' # [Optional] defaults to Ubuntu 10.04 64-bit
+            ship.livery = 'rails' # [Optional]
+            ship.group = 'Simple' # [Optional] The name of the desired Security Group
+            ship.region = 'us-west-1' # [Optional] defaults to us-west-2
+            ship.username = 'ubuntu' # [Optional] SSH username, defaults to "ubuntu" for AWS machines
         end
     end
 ```

data/features/cli/scp.feature

@@ -22,7 +22,7 @@ Feature: SCP a file into a named VM
 
   # This test is in the same boat that the complimentary test in ssh.feature is
   # in.
-  @slow @destroy @wip
+  @slow @destroy
   Scenario: SCPing a valid file
     Given I have the Blimpfile:
       """
@@ -33,5 +33,6 @@ Feature: SCP a file into a named VM
       end
       """
     And I have a file named "hello.txt"
+    And I run `blimpy start`
     When I run `blimpy scp "Cucumber Host" hello.txt`
     Then the exit status should be 0

data/lib/blimpy/box.rb

@@ -152,7 +152,9 @@ module Blimpy
     def ssh_into(*args)
       # Support using #ssh_into within our own code as well to pass arguments
       # to the ssh(1) binary
-      args = args || ARGV[2 .. -1]
+      if args.empty?
+        args = ARGV[2 .. -1]
+      end
       run_command('ssh', '-o', 'StrictHostKeyChecking=no',
                   '-l', username, dns_name, *args)
     end
@@ -166,7 +168,7 @@ module Blimpy
     def bootstrap_livery
       if livery == :cwd
         dir_name = File.basename(Dir.pwd)
-        run_command('rsync', '-av',
+        run_command('rsync', '-avL',
                     '--exclude=.git',
                     '--exclude=.svn',
                     '--exclude=.blimpy.d',

data/lib/blimpy/version.rb

@@ -1,3 +1,3 @@
 module Blimpy
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blimpy
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000Z
+date: 2012-06-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &7711400 !ruby/object:Gem::Requirement
+  requirement: &14091140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7711400
+  version_requirements: *14091140
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &7710980 !ruby/object:Gem::Requirement
+  requirement: &14090460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7710980
+  version_requirements: *14090460
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &7710540 !ruby/object:Gem::Requirement
+  requirement: &14089460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7710540
+  version_requirements: *14089460
 description: Blimpy is a tool for managing a fleet of machines in the CLOUD!
 email:
 - tyler@monkeypox.org
@@ -104,12 +104,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3393293475964109853
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3393293475964109853
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10