knife-joyent 0.0.10 → 0.1.0

data/README.md

@@ -72,9 +72,9 @@ provider powered by [SmartDataCenter](http://www.joyent.com/products/smartdatace
 
 ## Contributors
 
-[Sean Omera](https://github.com/someara) - Opscode
-[Eric Saxby](https://github.com/sax) - ModCloth
-[Stephen Lauck](https://github.com/stephenlauck) - ModCloth
+ - [Sean Omera](https://github.com/someara) - Opscode
+ - [Eric Saxby](https://github.com/sax) - ModCloth
+ - [Stephen Lauck](https://github.com/stephenlauck) - ModCloth
 
 ## License
 

data/knife-joyent.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
+$:.push File.expand_path("../lib", __FILE__)
 require 'knife-joyent/version'
 
 Gem::Specification.new do |s|
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.add_dependency "fog", "~> 1.3"
-  s.add_dependency "chef", "~> 0.10"
+  s.add_dependency "fog", "~> 1.6"
+  s.add_dependency "chef", ">= 0.10.10"
   s.require_paths = ["lib"]
 
 end

data/lib/chef/knife/joyent_base.rb

@@ -0,0 +1,60 @@
+require 'chef/knife'
+
+class Chef
+  class Knife
+    module JoyentBase
+
+      def self.included(includer)
+        includer.class_eval do
+          deps do
+            require 'fog'
+            require 'net/ssh/multi'
+            require 'readline'
+            require 'chef/json_compat'
+          end
+
+          option :joyent_username,
+            :short => '-U USERNAME',
+            :long => '--joyent-username USERNAME',
+            :description => 'Your Joyent username',
+            :proc => Proc.new {|key| Chef::Config[:knife][:joyent_username] = key}
+
+          option :joyent_password,
+            :short => '-P PASSWORD',
+            :long => '--joyent-password PASSOWRD',
+            :description => 'Your Joyent password',
+            :proc => Proc.new {|key| Chef::Config[:knife][:joyent_password] = key }
+
+          option :joyent_keyname,
+            :long => '--joyent-keyname name of ssh key for signature auth',
+            :description => 'name of ssh key for signature auth',
+            :proc => Proc.new {|key| Chef::Config[:knife][:joyent_keyname] = key }
+
+          option :joyent_keyfile,
+            :long => '--joyent-keyfile path to ssh private key for signature auth',
+            :description => 'path to ssh private key for signature auth',
+            :proc => Proc.new {|key| Chef::Config[:knife][:joyent_keyfile] = key }
+
+          option :joyent_api_url,
+            :short => "-L JOYENT_API_URL",
+            :long => "--joyent-api-url JOYENT_API_URL",
+            :description => "Joyent API URL",
+            :proc => Proc.new {|key| Chef::Config[:knife][:joyent_api_url] = key }
+        end
+      end
+
+      def connection
+        @connection ||= begin
+          connection = Fog::Compute.new(
+            :provider => 'Joyent',
+            :joyent_username => Chef::Config[:knife][:joyent_username],
+            :joyent_password => Chef::Config[:knife][:joyent_password],
+            :joyent_keyname => Chef::Config[:knife][:joyent_keyname],
+            :joyent_keyfile => Chef::Config[:knife][:joyent_keyfile],
+            :joyent_url => Chef::Config[:knife][:joyent_api_url]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/joyent_flavor_list.rb

@@ -1,29 +1,30 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
+class Chef
+  class Knife
+    class JoyentFlavorList < Knife
 
-module KnifeJoyent
-  class JoyentFlavorList < Chef::Knife
+      include Knife::JoyentBase
 
-    include KnifeJoyent::Base
+      banner "knife joyent flavor list <options>"
 
-    banner "knife joyent flavor list <options>"
+      def run
+        flavor_list = [
+          ui.color('Name', :bold),
+          ui.color('RAM', :bold),
+          ui.color('Disk', :bold),
+          ui.color('Swap', :bold),
+        ]
 
-    def run
-      flavor_list = [
-        ui.color('Name', :bold),
-        ui.color('RAM', :bold),
-        ui.color('Disk', :bold),
-        ui.color('Swap', :bold),
-      ]
+        self.connection.flavors.sort_by(&:memory).each do |flavor|
+          flavor_list << flavor.name.to_s
+          flavor_list << "#{flavor.memory/1024} GB"
+          flavor_list << "#{flavor.disk/1024} GB"
+          flavor_list << "#{flavor.swap/1024} GB"
+        end
 
-      self.connection.flavors.sort_by(&:memory).each do |flavor|
-        flavor_list << flavor.name.to_s
-        flavor_list << "#{flavor.memory/1024} GB"
-        flavor_list << "#{flavor.disk/1024} GB"
-        flavor_list << "#{flavor.swap/1024} GB"
+        puts ui.list(flavor_list, :uneven_columns_across, 4)
       end
-
-      puts ui.list(flavor_list, :uneven_columns_across, 4)
     end
   end
 end

data/lib/chef/knife/joyent_image_list.rb

@@ -1,30 +1,32 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
-module KnifeJoyent
-  class JoyentImageList < Chef::Knife
+class Chef
+  class Knife
+    class JoyentImageList < Knife
 
-    include KnifeJoyent::Base
+      include Knife::JoyentBase
 
-    banner "knife joyent image list <options>"
+      banner "knife joyent image list <options>"
 
-    def run
-      images = [
-        ui.color('ID', :bold),
-        ui.color('Name', :bold),
-        ui.color('Version', :bold),
-        ui.color('OS', :bold),
-        ui.color('Type', :bold),
-      ]
+      def run
+        images = [
+          ui.color('ID', :bold),
+          ui.color('Name', :bold),
+          ui.color('Version', :bold),
+          ui.color('OS', :bold),
+          ui.color('Type', :bold),
+        ]
 
-      self.connection.images.sort_by(&:name).each do |i|
-        images << i.id.to_s
-        images << i.name
-        images << i.version
-        images << i.os
-        images << i.type
-      end
+        self.connection.images.sort_by(&:name).each do |i|
+          images << i.id.to_s
+          images << i.name
+          images << i.version
+          images << i.os
+          images << i.type
+        end
 
-      puts ui.list(images, :uneven_columns_across, 5)
+        puts ui.list(images, :uneven_columns_across, 5)
+      end
     end
   end
 end

data/lib/chef/knife/joyent_key_add.rb

@@ -1,54 +1,55 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
+class Chef
+  class Knife
+    class JoyentKeyAdd < Knife
 
-module KnifeJoyent
-  class JoyentKeyAdd < Chef::Knife
+      include Knife::JoyentBase
 
-    include KnifeJoyent::Base
+      banner "knife joyent key add -f <keyfile> -k <name>"
 
-    banner "knife joyent key add -f <keyfile> -k <name>"
+      option :keyname,
+        :short => '-k KEY_NAME',
+        :long => '--keyname KEY_NAME',
+        :description => 'Name for identifying this key'
 
-    option :keyname,
-      :short => '-k KEY_NAME',
-      :long => '--keyname KEY_NAME',
-      :description => 'Name for identifying this key'
+      option :keyfile,
+        :short => '-f KEY_FILE',
+        :long => '--keyfile KEY_FILE',
+        :description => 'Full path to location of ssh public key'
 
-    option :keyfile,
-      :short => '-f KEY_FILE',
-      :long => '--keyfile KEY_FILE',
-      :description => 'Full path to location of ssh public key'
+      def run
+        keyfile = config[:keyfile]
+        keyname = config[:keyname]
 
-    def run
-      keyfile = config[:keyfile]
-      keyname = config[:keyname]
+        unless File.exists?(keyfile)
+          ui.error('keyfile specified does not exist')
+          exit 1
+        end
 
-      unless File.exists?(keyfile)
-        ui.error('keyfile specified does not exist')
-        exit 1
-      end
 
+        key = begin
+                File.read(keyfile)
+              rescue
+                puts ui.error('Unable to read contents of keyfile')
+                exit 1
+              end
 
-      key = begin
-              File.read(keyfile)
-            rescue
-              puts ui.error('Unable to read contents of keyfile')
-              exit 1
-            end
 
+        begin
+          r = self.connection.create_key(
+            :name => keyname,
+            :key => key
+          )
+        rescue Excon::Errors::Conflict => e
+          body = MultiJson.decode(e.response.body)
+          ui.error(body["message"])
+          exit 1
+        end
 
-      begin
-        r = self.connection.create_key(
-          :name => keyname,
-          :key => key
-        )
-      rescue Excon::Errors::Conflict => e
-        body = MultiJson.decode(e.response.body)
-        ui.error(body["message"])
-        exit 1
+        puts ui.color('Created key: '+keyname, :cyan)
+        exit 0
       end
-
-      puts ui.color('Created key: '+keyname, :cyan)
-      exit 0
     end
   end
 end

data/lib/chef/knife/joyent_key_delete.rb

@@ -1,33 +1,34 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
+class Chef
+  class Knife
+    class JoyentKeyDelete < Knife
 
-module KnifeJoyent
-  class JoyentKeyDelete < Chef::Knife
+      include Knife::JoyentBase
 
-    include KnifeJoyent::Base
+      banner "knife joyent key delete <name>"
 
-    banner "knife joyent key delete <name>"
+      def run
+        unless name_args.size === 1
+          show_usage
+        end
 
-    def run
-      unless name_args.size === 1
-        show_usage
-      end
+        keyname = name_args.first
 
-      keyname = name_args.first
+        begin
+          self.connection.delete_key(keyname)
+        rescue Excon::Errors::NotFound => e
+          ui.error("Key [#{keyname}] does not exist.")
+          exit 1
+        rescue Excon::Errors::Conflict => e
+          body = MultiJson.decode(e.response.body)
+          ui.error(body["message"])
+          exit 1
+        end
 
-      begin
-        self.connection.delete_key(keyname)
-      rescue Excon::Errors::NotFound => e
-        ui.error("Key [#{keyname}] does not exist.")
-        exit 1
-      rescue Excon::Errors::Conflict => e
-        body = MultiJson.decode(e.response.body)
-        ui.error(body["message"])
-        exit 1
+        puts ui.color('Deleted key: '+keyname, :cyan)
+        exit 0
       end
-
-      puts ui.color('Deleted key: '+keyname, :cyan)
-      exit 0
     end
   end
 end

data/lib/chef/knife/joyent_key_list.rb

@@ -1,25 +1,26 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
-module KnifeJoyent
-  class JoyentKeyList < Chef::Knife
+class Chef
+  class Knife
+    class JoyentKeyList < Knife
 
-    include KnifeJoyent::Base
+      include Knife::JoyentBase
 
-    banner "knife joyent key list"
+      banner "knife joyent key list"
 
-    def run
-      keys = [
-        ui.color('Name', :bold),
-        ui.color('Key', :bold),
-      ]
+      def run
+        keys = [
+          ui.color('Name', :bold),
+          ui.color('Key', :bold),
+        ]
 
-      self.connection.keys.sort_by(&:name).each do |k|
-        keys << k.name
-        keys << k.key[0..32] + '...'
-      end
-
-      puts ui.list(keys, :uneven_columns_across, 2)
+        self.connection.keys.sort_by(&:name).each do |k|
+          keys << k.name
+          keys << k.key[0..32] + '...'
+        end
 
+        puts ui.list(keys, :uneven_columns_across, 2)
+      end
     end
   end
 end