knife-server 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f3438d1a1763d6e1b499924e5d003bbf61bedc1
-  data.tar.gz: 7e323fdee09dc509f99116e5ac0dd58e367c885e
+  metadata.gz: 83b68a283fef42ef77414c6dfc62ad7030769d14
+  data.tar.gz: 427955c02665a84a4650a37061d0d987ff3d4321
 SHA512:
-  metadata.gz: 1c490bfd6820c94c6e7e3065f36b7265096a81b3474627f92cb253017dc665b66ca90b3f26f5a27a1b717d8d0092ee6d68f3da8366158f8c2d7535aca7dd973d
-  data.tar.gz: f53bb247487c0cb4f29e6f7fcab5ca3b0049ece1db8bc7a3ecf36c979a19f467f7a9989fe2d77cb4c3fba3b9e25cd25d7adbca727b86aa073c62fd2b28099600
+  metadata.gz: e12382dfc1a92aac14191ed3976ed46aaf480c126524990cb4f4cd72defb85b33528526b2aea91c04b931ac891f86b40e9c8576a342e322d731a5f6ee1a89035
+  data.tar.gz: f25f254039e81b453051d7ef943672c7058638226fb01cf823950e86e7bcc659c3cdf15f84a32cab940218e7694402449e49f96b3608bb5a8b2130b43dc30a64

data/.travis.yml

@@ -3,14 +3,12 @@ language: ruby
 rvm:
   - 2.1
   - 2.0.0
-  - 1.9.3
   - ruby-head
 
 env:
   - "CHEF_VERSION="
   - "CHEF_VERSION='~> 11.14.2'"
   - "CHEF_VERSION='~> 11.4.4'"
-  - "CHEF_VERSION='~> 10.26'"
 
 bundler_args: --without guard
 

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.4.0 / 2014-12-03
+
+### Upstream changes
+
+* Fix support for knife-openstack >= 1.0.0. ([@fnichol][])
+* Fix support for knife-digtal_ocean >= 2.0.0. ([@fnichol][])
+
+
 ## 1.3.0 / 2014-09-14
 
 ### New features

data/Gemfile

@@ -7,7 +7,6 @@ gemspec
 group :guard do
   gem "guard-rspec"
   gem "guard-rubocop"
-  gem "guard-cane"
 end
 
 group :test do

data/Guardfile

@@ -16,11 +16,6 @@ group :red_green_refactor, :halt_on_fail => true do
     watch(%r{^spec/spec_helper\.rb})  { "spec" }
   end
 
-  guard :cane do
-    watch(%r{.*\.rb})
-    watch(".cane")
-  end
-
   guard :rubocop, rubocop_opts do
     watch(%r{.+\.rb$})
     watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }

data/README.md

@@ -5,7 +5,7 @@
 [![Code Climate](https://codeclimate.com/github/fnichol/knife-server.png)](https://codeclimate.com/github/fnichol/knife-server)
 [![Dependency Status](https://gemnasium.com/fnichol/knife-server.png)](https://gemnasium.com/fnichol/knife-server)
 
-An Chef Knife plugin to manage Chef Servers. Bootstrap a new Chef
+A Chef Knife plugin to manage Chef Servers. Bootstrap a new Chef
 Server on Amazon's EC2, Digital Ocean, Linode, OpenStack or a standalone server.
 Backup and restore your Chef Server or Hosted Chef's node, role, data bag, and
 environment JSON data.
@@ -44,11 +44,10 @@ To spin up your Chef Server on [Digital Ocean][do_site]:
 ```bash
 knife server bootstrap digitalocean \
   --node-name chefapalooza.example.com \
-  --digital_ocean_client_id $DIGITAL_OCEAN_CLIENT_ID \
-  --digital_ocean_api_key $DIGITAL_OCEAN_API_KEY \
-  --location 3 \
-  --size 63 \
-  --image 5588928 \
+  --digital_ocean_access_token $DIGITAL_OCEAN_ACCESS_TOKEN \
+  --location sfo1 \
+  --size 1gb \
+  --image ubuntu-12-04-x64 \
   --ssh-keys $DIGITAL_OCEAN_SSH_KEY_ID \
   --identity-file ~/.ssh/id_rsa-do
 ```
@@ -216,8 +215,7 @@ knife[:flavor] = "t1.micro"
 knife[:linode_api_key] = "MY_KEY"
 
 # for digitalocean
-knife[:digital_ocean_client_id] = "MY_CLIENT_ID"
-knife[:digital_ocean_api_key] = "MY_KEY"
+knife[:digital_ocean_acceess_token] = "MY_TOKEN"
 ```
 
 Better yet, why not try a more generic [knife.rb][chef_bootstrap_knife_rb] file

data/knife-server.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency "chef",      ">= 0.10.10"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "knife-digital_ocean"
+  gem.add_development_dependency "knife-digital_ocean", ">= 2.0.0"
   gem.add_development_dependency "knife-ec2", ">= 0.5.12"
   gem.add_development_dependency "knife-linode"
-  gem.add_development_dependency "knife-openstack"
+  gem.add_development_dependency "knife-openstack", ">= 1.0.0"
 
   gem.add_development_dependency "rspec", "~> 3.0"
   gem.add_development_dependency "fakefs", "~> 0.4"
@@ -36,6 +36,6 @@ Gem::Specification.new do |gem|
   # style and complexity libraries are tightly version pinned as newer releases
   # may introduce new and undesireable style choices which would be immediately
   # enforced in CI
-  gem.add_development_dependency "finstyle",  "1.2.0"
+  gem.add_development_dependency "finstyle",  "1.3.0"
   gem.add_development_dependency "cane",      "2.6.2"
 end

data/lib/chef/knife/server_bootstrap_digitalocean.rb

@@ -35,7 +35,7 @@ class Chef
 
         begin
           require "chef/knife/digital_ocean_droplet_create"
-          require "fog"
+          require "droplet_kit"
           Chef::Knife::DigitalOceanDropletCreate.load_deps
 
           current_options = options
@@ -96,19 +96,17 @@ class Chef
       end
 
       def digital_ocean_connection
-        @digital_ocean_connection ||= Fog::Compute.new(
-          :provider => "DigitalOcean",
-          :digitalocean_client_id => config_val(:digital_ocean_client_id),
-          :digitalocean_api_key => config_val(:digital_ocean_api_key)
+        @digital_ocean_connection ||= DropletKit::Client.new(
+          :access_token => config_val(:digital_ocean_access_token)
         )
       end
 
       def server_ip_address
-        server = digital_ocean_connection.servers.find do |s|
-          s.state == "active" && s.name == config_val(:chef_node_name)
+        server = digital_ocean_connection.droplets.all.find do |s|
+          s.status == "active" && s.name == config_val(:chef_node_name)
         end
 
-        server && server.public_ip_address
+        server && server.public_ip
       end
 
       private

data/lib/chef/knife/server_bootstrap_openstack.rb

@@ -28,6 +28,14 @@ class Chef
 
       include Knife::ServerBootstrapBase
 
+      def self.wrapped_plugin_class
+        Chef::Knife::Cloud::OpenstackServerCreate
+      end
+
+      def wrapped_plugin_class
+        self.class.wrapped_plugin_class
+      end
+
       deps do
         require "knife/server/ssh"
         require "knife/server/credentials"
@@ -35,10 +43,10 @@ class Chef
         begin
           require "chef/knife/openstack_server_create"
           require "fog"
-          Chef::Knife::OpenstackServerCreate.load_deps
+          wrapped_plugin_class.load_deps
 
           current_options = options
-          self.options = Chef::Knife::OpenstackServerCreate.options.dup
+          self.options = wrapped_plugin_class.options.dup
           options.merge!(current_options)
         rescue LoadError => ex
           ui.error [
@@ -63,8 +71,8 @@ class Chef
         ENV["WEBUI_PASSWORD"] = config_val(:webui_password)
         ENV["AMQP_PASSWORD"] = config_val(:amqp_password)
         ENV["NO_TEST"] = "1" if config[:no_test]
-        bootstrap = Chef::Knife::OpenstackServerCreate.new
-        Chef::Knife::OpenstackServerCreate.options.keys.each do |attr|
+        bootstrap = wrapped_plugin_class.new
+        wrapped_plugin_class.options.keys.each do |attr|
           val = config_val(attr)
           next if val.nil?
 

data/lib/knife/server/version.rb

@@ -19,6 +19,6 @@
 
 module Knife
   module Server
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end
 end

data/spec/chef/knife/server_bootstrap_digitalocean_spec.rb

@@ -38,7 +38,7 @@ describe Chef::Knife::ServerBootstrapDigitalocean do
     @knife.config[:ssh_user] = "root"
   end
 
-  let(:connection) { double(Fog::Compute::AWS) }
+  let(:connection) { double(DropletKit::Client) }
 
   describe "#digital_ocean_bootstrap" do
 
@@ -46,8 +46,7 @@ describe Chef::Knife::ServerBootstrapDigitalocean do
       @knife.config[:chef_node_name] = "shave.yak"
       @knife.config[:ssh_user] = "jdoe"
       @knife.config[:identity_file] = "~/.ssh/mykey_dsa"
-      @knife.config[:digital_ocean_client_id] = "clientxyz"
-      @knife.config[:digital_ocean_api_key] = "do123"
+      @knife.config[:digital_ocean_access_token] = "do123"
       @knife.config[:distro] = "distro-praha"
       @knife.config[:webui_password] = "daweb"
       @knife.config[:amqp_password] = "queueitup"
@@ -79,12 +78,8 @@ describe Chef::Knife::ServerBootstrapDigitalocean do
       expect(bootstrap.config[:identity_file]).to eq("~/.ssh/mykey_dsa")
     end
 
-    it "configs the bootstrap's digital_ocean_client_id" do
-      expect(bootstrap.config[:digital_ocean_client_id]).to eq("clientxyz")
-    end
-
-    it "configs the bootstrap's digital_ocean_api_key" do
-      expect(bootstrap.config[:digital_ocean_api_key]).to eq("do123")
+    it "configs the bootstrap's digital_ocean_access_token" do
+      expect(bootstrap.config[:digital_ocean_access_token]).to eq("do123")
     end
 
     it "configs the bootstrap's distro" do
@@ -138,26 +133,21 @@ describe Chef::Knife::ServerBootstrapDigitalocean do
     before do
       @before_config = Hash.new
       @before_config[:knife] = Hash.new
-      [:digital_ocean_client_id, :digital_ocean_api_key].each do |key|
+      [:digital_ocean_access_token].each do |key|
         @before_config[:knife][key] = Chef::Config[:knife][key]
       end
 
-      Chef::Config[:knife][:digital_ocean_client_id] = "client"
-      Chef::Config[:knife][:digital_ocean_api_key] = "api"
+      Chef::Config[:knife][:digital_ocean_access_token] = "api"
     end
 
     after do
-      [:digital_ocean_client_id, :digital_ocean_api_key].each do |key|
+      [:digital_ocean_access_token].each do |key|
         Chef::Config[:knife][key] = @before_config[:knife][key]
       end
     end
 
     it "constructs a connection" do
-      expect(Fog::Compute).to receive(:new).with(
-        :provider => "DigitalOcean",
-        :digitalocean_client_id => "client",
-        :digitalocean_api_key => "api"
-      )
+      expect(DropletKit::Client).to receive(:new).with(:access_token => "api")
 
       @knife.digital_ocean_connection
     end
@@ -165,40 +155,36 @@ describe Chef::Knife::ServerBootstrapDigitalocean do
 
   describe "#server_ip_address" do
 
+    let(:droplets_resource) { double(:all => droplets) }
+
     before do
       @knife.config[:chef_node_name] = "yak"
       allow(@knife).to receive(:digital_ocean_connection) { connection }
+      allow(connection).to receive(:droplets) { droplets_resource }
     end
 
-    context "when server is found" do
-
-      before do
-        allow(connection).to receive(:servers) { [server] }
-      end
+    context "when single server is found" do
 
       let(:server) do
-        double(
-          :name => "yak",
-          :state => "active",
-          :public_ip_address => "10.11.12.13"
-        )
+        double(:name => "yak", :status => "active", :public_ip => "10.11.12.13")
       end
 
+      let(:droplets) { [server] }
+
       it "returns the provisioned ip address" do
         expect(@knife.server_ip_address).to eq("10.11.12.13")
       end
 
       it "ignores terminated instances" do
-        allow(server).to receive(:state) { "foobar" }
+        allow(server).to receive(:status) { "foobar" }
 
         expect(@knife.server_ip_address).to be_nil
       end
     end
 
     context "when server is not found" do
-      before do
-        allow(connection).to receive(:servers) { [] }
-      end
+
+      let(:droplets) { [] }
 
       it "returns nil" do
         expect(@knife.server_ip_address).to be_nil

data/spec/chef/knife/server_bootstrap_openstack_spec.rb

@@ -63,7 +63,7 @@ describe Chef::Knife::ServerBootstrapOpenstack do
     let(:bootstrap) { @knife.openstack_bootstrap }
 
     it "returns a OpenstackServerCreate instance" do
-      expect(bootstrap).to be_a(Chef::Knife::OpenstackServerCreate)
+      expect(bootstrap).to be_a(Chef::Knife::Cloud::OpenstackServerCreate)
     end
 
     it "configs the bootstrap's chef_node_name" do
@@ -211,7 +211,8 @@ describe Chef::Knife::ServerBootstrapOpenstack do
       @knife.config[:ssh_password] = "booboo"
       allow(@knife).to receive(:openstack_connection)  { connection }
       allow(@knife).to receive(:server_ip_address)  { "11.11.11.13" }
-      allow(Chef::Knife::OpenstackServerCreate).to receive(:new) { bootstrap }
+      allow(Chef::Knife::Cloud::OpenstackServerCreate).
+        to receive(:new) { bootstrap }
       allow(Knife::Server::SSH).to receive(:new) { ssh }
       allow(Knife::Server::Credentials).to receive(:new) { credentials }
       allow(credentials).to receive(:install_validation_key)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-server
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: knife-ec2
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement