knife-digital_ocean 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTZkMjlmY2NhNmQ3YmQ1ZjM1ZTI0MjM0MmQyMmQwZDRlOGVlM2I0OA==
-  data.tar.gz: !binary |-
-    NTFmN2M3ZTQ0NDZiMzQxM2Y0NmIzZGJlZDgwYWU0NWMzY2E5NDFhYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NzQ1Y2Y5Mjk5YWJjZTNiOTNlZTQzNTljMjEwMzI0MTZjMTZjNzk1ZmMxYmUy
-    OGYyMzFjMmU0YTRlYjJhMTQwZTFhMGJlMzU1NmJjNzYwOTNlMzc4Mjc0MDM2
-    NGIzOTRkNGMzM2MzYmRlMzcxYjc2MWE4ZTcwMzRiYjNlOWI4Y2U=
-  data.tar.gz: !binary |-
-    NTczNTdhM2E4YTk1ZWM5MTAxZmU0MDI5ZWFiNjM3MjE1ZDA0OTczYjdjZWYy
-    YTgxZDgzNzhjZTJkMjEwZTM0YzVkN2UwNTdmNGI0MGE3Y2RkNzM1NDE2YzYy
-    Y2E2ZDZkZWFkYzJhOWRmNjI5YTRlMmJkYTM4N2E5ZTkyYzY0OWI=
+SHA1:
+  metadata.gz: 8134b23992ea183fc358322e9119f53871a3194a
+  data.tar.gz: a8acb23a08257dfc719947ca9811c99266948af4
+SHA512:
+  metadata.gz: 9fa59b68050f3171f06430d0dc19957def328b2da913f98ba9d1713419c9253832cfd880154dd5302917552915652d19bcd17d67417edba16ddead4e4edc1064
+  data.tar.gz: 8577c105e27a3de7a53a32cd940ef6a152cf6d120c1139d29918ab555bcd2e770631e6bf60be12f072be385511815426a3ec5424c8c34a5df1ce186e8834da1b

data/CHANGELOG.md

@@ -1,8 +1,18 @@
-## 0.1.1 / unreleased
+## 0.1.2 / unreleased
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.1.1...master)
+*
+
+
+## 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)
+* 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...master)
+* [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)
 * added basic rspec tests for various bootstrapping options
 * remove JRuby from CI as chef itself does currently not work with JRuby

data/knife-digital_ocean.gemspec

@@ -10,11 +10,11 @@ Gem::Specification.new do |gem|
   gem.email         = ['roland@moriz.de']
   gem.description   = %q{A plugin for chef's knife to manage instances of DigitalOcean servers}
   gem.summary       = %q{A plugin for chef's knife to manage instances of DigitalOcean servers}
-  gem.homepage      = 'http://github.com/rmoriz/knife-digital_ocean'
+  gem.homepage      = 'https://github.com/rmoriz/knife-digital_ocean'
   gem.license       = 'Apache 2.0'
 
   gem.add_dependency 'chef', '>= 10.18'
-  gem.add_dependency 'digital_ocean'
+  gem.add_dependency 'digital_ocean', '~> 1.0.1'
   gem.add_dependency 'highline'
 
   gem.add_development_dependency 'rspec', '~> 2.13'

data/lib/chef/knife/digital_ocean_droplet_create.rb

@@ -227,7 +227,7 @@ class Chef
       def bootstrap_for_node(ip_address)
         bootstrap = bootstrap_class.new
         bootstrap.name_args = [ ip_address ]
-        bootstrap.config = config.dup
+        bootstrap.config.merge! config
         bootstrap.config[:chef_node_name] = locate_config_value(:server_name)
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
         bootstrap.config[:distro] = locate_config_value(:distro)

data/lib/knife-digital_ocean/version.rb

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

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: knife-digital_ocean
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Roland Moriz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '10.18'
 - !ruby/object:Gem::Dependency
   name: digital_ocean
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -70,70 +70,70 @@ dependencies:
   name: guard
   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'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   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'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: knife-solo
   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 plugin for chef's knife to manage instances of DigitalOcean servers
@@ -171,7 +171,7 @@ files:
 - spec/lib/chef/knife/digital_ocean_sshkey_list_spec.rb
 - spec/lib/knife-digital_ocean/version_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/rmoriz/knife-digital_ocean
+homepage: https://github.com/rmoriz/knife-digital_ocean
 licenses:
 - Apache 2.0
 metadata: {}
@@ -181,12 +181,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []