knife-digital_ocean 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8134b23992ea183fc358322e9119f53871a3194a
-  data.tar.gz: a8acb23a08257dfc719947ca9811c99266948af4
+  metadata.gz: 4d6837eb0ed9318f5dc3d7df661b9d7fa74bdb86
+  data.tar.gz: 6c959c38bbcb222e5792ac208d8fa034e10c0cbb
 SHA512:
-  metadata.gz: 9fa59b68050f3171f06430d0dc19957def328b2da913f98ba9d1713419c9253832cfd880154dd5302917552915652d19bcd17d67417edba16ddead4e4edc1064
-  data.tar.gz: 8577c105e27a3de7a53a32cd940ef6a152cf6d120c1139d29918ab555bcd2e770631e6bf60be12f072be385511815426a3ec5424c8c34a5df1ce186e8834da1b
+  metadata.gz: b43a58d4b73a34bd132db0f7167b7fe68bad93f38e1b63d4c8d04f18778a307056ca75e7ba6b1da8b3555e90358aeb1f26a49f99438e5d44ff20391e15524a58
+  data.tar.gz: e4bfe933f58ca1670c91f835d1f3e18f3ea1126c307f73168f7b5e92397d8ca7c0bc99eb3d76559d228121ccc61e3a9521547e2c346c740984d81b46cdcf901d

data/.travis.yml

@@ -5,4 +5,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 script: bundle exec rake test

data/CHANGELOG.md

@@ -1,19 +1,27 @@
-## 0.1.2 / unreleased
-* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.1.1...master)
-*
+## unreleased
+
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.2.0...master)
+
+
+## 0.2.0 / 2013-09-07
+
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.1.1...v0.2.0)
+* require ```digital_ocean``` gem version 1.2.0 or later_
+* ensure status of image details is OK before outputting image name (thanks @salemine)
+* add option to pass environment (thanks @tedkulp)
 
 
 ## 0.1.1 / 2013-03-26
 
 * [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.1.0...v0.1.1)
-* Merge to Knife bootstrap config instead of overwriting it (by tmatilai)
+* merge to knife bootstrap config instead of overwriting it (thanks @tmatilai)
 * bump dependency to ```digital_ocean``` gem to circument issue https://github.com/rmoriz/knife-digital_ocean/issues/10
 
 
 ## 0.1.0 / 2013-03-01
 
 * [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.0.5...v0.1.0)
-* support for integrated ```knife-solo``` bootstrapping using the ```--solo``` option (by tmatilai)
+* support for integrated ```knife-solo``` bootstrapping using the ```--solo``` option (thanks @tmatilai)
 * added basic rspec tests for various bootstrapping options
 * remove JRuby from CI as chef itself does currently not work with JRuby
   except when c-extensions are enabled (off by default)

data/README.md

@@ -1,6 +1,7 @@
 # Knife::DigitalOcean
 ## A knife plugin to deal with the [DigitalOcean.com](https://www.digitalocean.com) Cloud services.
 
+[![Gem Version](https://badge.fury.io/rb/knife-digital_ocean.png)](http://badge.fury.io/rb/knife-digital_ocean)
 [![Build Status](https://travis-ci.org/rmoriz/knife-digital_ocean.png)](https://travis-ci.org/rmoriz/knife-digital_ocean)
 <a href="https://gemnasium.com/rmoriz/knife-digital_ocean"><img src="https://gemnasium.com/rmoriz/knife-digital_ocean.png"/></a>
 <a href="https://codeclimate.com/github/rmoriz/knife-digital_ocean"><img src="https://codeclimate.com/github/rmoriz/knife-digital_ocean.png"/></a>
@@ -265,8 +266,22 @@ For more information and a complete list see [the contributor page on GitHub](ht
 Apache 2.0 (like Chef itself), see LICENSE.txt file.
 
 
+## Mobile Application
+
+Ever wanted to control your DigitalOcean Droplets with your iPhone, iPad or iPod Touch?
+
+[Get my CloudOcean App!](http://cloudoceanapp.com/)
+
+[![CloudOcean - DigitalOcean iOS app](http://i.imgur.com/JLQua2w.png)](http://cloudoceanapp.com/)
+
+
 ## Copyright
 
 Copyright © 2013 [Roland Moriz](https://roland.io), [Moriz GmbH](https://moriz.de/)
 
 [![LinkedIn](http://www.linkedin.com/img/webpromo/btn_viewmy_160x25.png)](http://www.linkedin.com/in/rmoriz)
+[![Twitter](http://i.imgur.com/1kYFHlu.png)](https://twitter.com/rmoriz)
+
+
+
+

data/knife-digital_ocean.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.license       = 'Apache 2.0'
 
   gem.add_dependency 'chef', '>= 10.18'
-  gem.add_dependency 'digital_ocean', '~> 1.0.1'
+  gem.add_dependency 'digital_ocean', '~> 1.2.0'
   gem.add_dependency 'highline'
 
   gem.add_development_dependency 'rspec', '~> 2.13'

data/lib/chef/knife/digital_ocean_droplet_create.rb

@@ -115,6 +115,13 @@ class Chef
         :description => "The version of Chef to install",
         :proc        => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
 
+      option :environment,
+        :short       => "-E ENVIRONMENT",
+        :long        => "--environment ENVIRONMENT",
+        :description => "The name of the chef environment to use",
+        :proc        => Proc.new { |e| Chef::Config[:knife][:environment] = e },
+        :default     => '_default'
+
       def run
         $stdout.sync = true
 
@@ -233,6 +240,7 @@ class Chef
         bootstrap.config[:distro] = locate_config_value(:distro)
         bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
         bootstrap.config[:template_file] = locate_config_value(:template_file)
+        bootstrap.config[:environment] = locate_config_value(:environment)
         bootstrap
       end
 

data/lib/chef/knife/digital_ocean_droplet_list.rb

@@ -50,7 +50,15 @@ class Chef
           droplet_list << sizes[droplet.size_id]
           droplet_list << regions[droplet.region_id]
           droplet_list << droplet.ip_address.to_s
-          droplet_list << droplet.image_id.to_s + ' (' + client.images.show(droplet.image_id).image.name +  ')'
+
+          image_details = client.images.show(droplet.image_id)
+          if image_details.status != 'OK'
+            image_os_info = 'N/A'
+          else
+            image_os_info = image_details.image.name 
+          end
+            
+          droplet_list << droplet.image_id.to_s + ' (' + image_os_info +  ')'
           droplet_list << droplet.status.to_s
         end
 

data/lib/knife-digital_ocean/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module DigitalOcean
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-digital_ocean
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Roland Moriz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: A plugin for chef's knife to manage instances of DigitalOcean servers