knife-softlayer 0.3.3 → 0.3.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmY4NThkYjg3NTA1ZDU3MjVkNGE5NTU1ODliNjQxOTg3Y2NhNjY2Ng==
+    NmFiNGJiYmRmN2E0OWRkM2FkNjA5NGRkMDViYWM3ZWM5ZmVkNWYxMg==
   data.tar.gz: !binary |-
-    NzdiNWRjZDQ4NjZjZTc1Y2ZlOGVhNzM3OThlMWU0MzRlZjExOTc0Yg==
+    NWMwMWNlNWE4YzBhMTcwOGJlZWQ0Y2I3OTFkMzQ5MTk1MmMyZjEyYQ==
 SHA512:
   metadata.gz: !binary |-
-    YTM2Mjg3ODAwZjNhMmVkZGNiZGFiODUwMGQ1ZjU2OWY3NWUxYjlmNmEzYWY0
-    NjdhYjgyMjQzZGZlNWNkNDkwZWQ2YmM2NDI3ZGNiZGVlOThjMjFlZjY5ZDI0
-    MTQ5YjYwYzA5OTAxZDM3YzQwNmM5ZDIxYjNiOTQxZjNiMjQxNTU=
+    YmU1NTMyMWNiYjU1Zjk0NzZiYTM3NzlkMTZmZTUxNTk0ZjYxODA2MzJmZTUw
+    ZDA1YjkxMjExNzY5NDRjMjA4MTkyN2NhZWE0YWMxOGEwNTczMjJhNTliOWVm
+    NjA5NTg5NTA2NmJjNzhmZjliYTBjMDA0MDE3NjQ3MzNmZjE3Nzg=
   data.tar.gz: !binary |-
-    OTI0NDM3YTVjMTQxMmJjMzI5MzQ0MGUyNGY1MGYyNzU5MWExNWE2NzNlMWRj
-    NmM2ZDU0ZTAxNDhlYzM3NjUzODBjOGZkY2FhZTliMTE2ZjlhYTUzMjI1NGEx
-    Y2U5NTNjNTU4ZTg1YTA5Nzk5YWM5M2Y2ZGU0YTc5NTllZGI0ZDk=
+    YjBmNDVhYTkyN2VlYzQ5ZGUwMzEyMDUyZDYzNjhhZDViNDc1Yjc0YjFmMzEy
+    NTRhMDgwZmE1NGE4MTEzNDhmOTQwNDZkNGE3ZjI1MjZjY2Y0OTYzZjEzZDZi
+    N2NhZTUyMGYzNmE4M2Y1ZjlmMjgyNTBlZWVkYTg1YWM3NzZlZjE=

data/CONTRIBUTORS.md

@@ -0,0 +1,3 @@
+* Dave Henderson <dave.henderson@ca.ibm.com>
+* HIGUCHI Daisuke <d-higuchi@creationline.com>
+* Matt Eldridge <matt.eldridge@us.ibm.com>

data/knife-softlayer.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(spec|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fog-softlayer", "~> 0.3", ">= 0.3.14"
+  spec.add_dependency "fog-softlayer", "~> 0.3", ">= 0.3.20"
   spec.add_dependency "knife-windows", "> 0.5.12"
   spec.add_dependency "net-ssh", "> 2.8.0"
 
@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~>10.1"
   spec.add_development_dependency "sdoc", "~>0.3"
   spec.add_development_dependency "bundler", "~>1.5"
+  spec.add_development_dependency "osrcry"
 end

data/lib/chef/knife/softlayer_server_create.rb

@@ -53,7 +53,8 @@ class Chef
       option :block_storage,
         :long => '--block-storage VALUE',
         :short => '-B VALUE',
-        :description => 'The size in GB of the block storage devices (disks) for this instance. Specify 1 - 5 entries in a comma separated list following the format "dev:size".  Example: "0:25,2:500" would be a 25GB volume on device 0 (the root partition) and a 100GB volume on on device 2. [NOTE: SoftLayer VMs always reserve device 1 for a swap device.] '
+        :description => 'The size in GB of the block storage devices (disks) for this instance. Specify 1 - 5 entries in a comma separated list following the format "dev:size".  Example: "0:25,2:500" would be a 25GB volume on device 0 (the root partition) and a 100GB volume on on device 2. [NOTE: SoftLayer VMs always reserve device 1 for a swap device.] ',
+        :proc => Proc.new { |devs| devs.split(',').map{ |dev| device, capacity = dev.split(':'); {"device"=>device, "diskImage"=>{"capacity"=>capacity}}  }  }
 
       option :nic,
         :long => '--network-interface-speed VALUE',

data/lib/knife-softlayer/version.rb

@@ -7,6 +7,6 @@
 
 module Knife
   module Softlayer
-    VERSION = "0.3.3"
+    VERSION = "0.3.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Matt Eldridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-softlayer
@@ -19,7 +19,7 @@ dependencies:
         version: '0.3'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.3.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.3'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: knife-windows
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: osrcry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A knife plugin for launching and bootstrapping instances in the IBM SoftLayer
   cloud.
 email:
@@ -154,6 +168,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
+- CONTRIBUTORS.md
 - Gemfile
 - LICENSE.txt
 - README.md