knife-softlayer 0.0.5 → 0.1.1

data/.travis.yml

@@ -0,0 +1,22 @@
+language: ruby
+
+script: bundle exec rspec spec
+
+matrix:
+  fast_finish: true
+  include:
+    - rvm: 1.9.3
+      gemfile: Gemfile
+    - rvm: 2.0.0
+      gemfile: Gemfile
+    - rvm: 2.1.0
+      gemfile: Gemfile
+    - rvm: 2.1.1
+      gemfile: Gemfile
+      env: COVERAGE=true
+
+notifications:
+  email: matt.eldridge@us.ibm.com
+
+before_install:
+  - gem update --system #  todo: workaround for https://github.com/rubygems/rubygems/pull/763

data/README.md

@@ -1,4 +1,7 @@
 # Knife::Softlayer
+[![Gem Version](https://badge.fury.io/rb/knife-softlayer.png)](http://badge.fury.io/rb/knife-softlayer)
+[![Build Status](https://api.travis-ci.org/softlayer/knife-softlayer.svg?branch=SAN-storage)](https://travis-ci.org/softlayer/knife-softlayer)
+[![Dependency Status](https://gemnasium.com/softlayer/knife-softlayer.svg)](https://gemnasium.com/softlayer/knife-softlayer)
 
 A knife plugin for launching and bootstrapping instances in the IBM SoftLayer cloud.
 

data/knife-softlayer.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.version       = Knife::Softlayer::VERSION
   spec.authors       = ["Matt Eldridge"]
   spec.email         = ["matt.eldridge@us.ibm.com"]
-  spec.summary       = %q{SoftLayer CCI support for Chef's knife utility.}
+  spec.summary       = %q{SoftLayer VM support for Chef's knife utility.}
   spec.description   = spec.summary
   spec.homepage      = "https://github.com/SoftLayer/knife-softlayer"
   spec.license       = "Apache 2.0"

data/lib/chef/knife/softlayer_server_create.rb

@@ -73,19 +73,19 @@ class Chef
 
       option :single_tenant,
         :long => '--single-tenant',
-        :description => 'Create a CCI VM with a dedicated physical host.',
+        :description => 'Create a VM with a dedicated physical host.',
         :boolean => true,
         :default => false
 
-      option :san_storage,
-        :long => '--san-storage',
-        :description => 'Create a CCI VM with SAN based block storage [disk].',
+      option :local_storage,
+        :long => '--local-storage',
+        :description => 'Force local block storage instead of SAN storage.',
         :boolean => true,
         :default => false
 
       option :datacenter,
         :long => '--datacenter VALUE',
-        :description => 'Create a CCI VI in a particular datacenter.'
+        :description => 'Create a VM in a particular datacenter.'
 
       option :tags,
              :short => "-T T=V[,T=V,...]",
@@ -230,7 +230,7 @@ class Chef
           @template = {}
           @template['startCpus'] = config[:cores]
           @template['maxMemory'] = config[:ram]
-          @template['localDiskFlag'] = !config[:san_storage]
+          @template['localDiskFlag'] = config[:local_storage]
           @template['blockDevices'] = config[:block_storage].split(',').map do |i|
             dev, cap = i.split(':')
             {'device' => dev, 'diskImage' => {'capacity' => cap } }
@@ -249,7 +249,7 @@ class Chef
 
         @response = connection.createObject(@template)
 
-        puts ui.color("Launching SoftLayer CCI, this may take a few minutes.", :green)
+        puts ui.color("Launching SoftLayer VM, this may take a few minutes.", :green)
 
         begin
           @cci = connection.object_mask('mask.operatingSystem.passwords.password').object_with_id(@response['id']).getObject

data/lib/chef/knife/softlayer_server_destroy.rb

@@ -28,7 +28,7 @@ class Chef
       option :ip_address,
         :long => "--ip-address ADDRESS",
         :short => "-I",
-        :description => "Find the CCI and node to destroy by its public IP address."
+        :description => "Find the VM and node to destroy by its public IP address."
 
       ##
       # Run the procedure to destroy a SoftLayer VM and clean up its Chef node and client.
@@ -37,7 +37,7 @@ class Chef
 
         $stdout.sync = true
 
-        puts ui.color("Decommissioning SoftLayer CCI, this may take a few minutes.", :green)
+        puts ui.color("Decommissioning SoftLayer VM, this may take a few minutes.", :green)
 
         @chef = Chef::Search::Query.new
 
@@ -58,7 +58,7 @@ class Chef
 
 
         @node.nil? and raise "#{ui.color('Chef node not found!', :red)}"
-        @cci.nil? and raise "#{ui.color('CCI instance with IP: ' + config[:ip_address] +' not found!', :red)}"
+        @cci.nil? and raise "#{ui.color('VM instance with IP: ' + config[:ip_address] +' not found!', :red)}"
 
 
         begin
@@ -82,9 +82,9 @@ class Chef
 
           begin
             connection.object_with_id(@cci['id']).deleteObject
-            puts ui.color("SoftLayer CCI successfully deleted. You are no longer being billed for this instance.", :green)
+            puts ui.color("SoftLayer VM successfully deleted. You are no longer being billed for this instance.", :green)
           rescue Exception => e
-            err_msg ui.color("ERROR DELETING SOFTLAYER CCI. IT'S POSSIBLE YOU ARE STILL BEING BILLED FOR THIS INSTANCE.  PLEASE CONTACT SUPPORT FOR FURTHER ASSISTANCE", :red)
+            err_msg ui.color("ERROR DELETING SOFTLAYER VM. IT'S POSSIBLE YOU ARE STILL BEING BILLED FOR THIS INSTANCE.  PLEASE CONTACT SUPPORT FOR FURTHER ASSISTANCE", :red)
             err_msg ui.color(e.message, :yellow)
             err_msg ui.color(e.backtrace, :yellow)
           end

data/lib/knife-softlayer/version.rb

@@ -7,6 +7,6 @@
 
 module Knife
   module Softlayer
-    VERSION = "0.0.5"
+    VERSION = "0.1.1"
   end
 end

data/spec/unit/softlayer_server_create_spec.rb

@@ -90,7 +90,7 @@ describe Chef::Knife::SoftlayerServerCreate do
       @bootstrap.config[:distro].should == 'chef-full'
     end
 
-    it "creates an CCI instance and bootstraps it" do
+    it "creates an VM instance and bootstraps it" do
       @knife_softlayer_create.run
       @knife_softlayer_create.cci.should_not == nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: softlayer_api
@@ -171,7 +171,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: SoftLayer CCI support for Chef's knife utility.
+description: SoftLayer VM support for Chef's knife utility.
 email:
 - matt.eldridge@us.ibm.com
 executables: []
@@ -179,6 +179,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -225,7 +226,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: SoftLayer CCI support for Chef's knife utility.
+summary: SoftLayer VM support for Chef's knife utility.
 test_files:
 - spec/spec_helper.rb
 - spec/unit/softlayer_base_spec.rb