knife-joyent 0.0.10 → 0.1.0

data/lib/chef/knife/joyent_tag_list.rb

@@ -1,35 +1,37 @@
-require File.expand_path(File.dirname(__FILE__) + '/base')
+require 'chef/knife/joyent_base'
 
-module KnifeJoyent
-  class JoyentTagList < Chef::Knife
+class Chef
+  class Knife
+    class JoyentTagList < Knife
 
-    include KnifeJoyent::Base
+      include Knife::JoyentBase
 
-    banner "knife joyent tag list <server>"
+      banner "knife joyent tag list <server>"
 
-    def run
-      server = name_args.first
+      def run
+        server = name_args.first
 
-      unless server
-        show_usage
-        exit 1
-      end
+        unless server
+          show_usage
+          exit 1
+        end
 
-      tags = [
-        ui.color('Name', :bold),
-        ui.color('Value', :bold),
-      ]
+        tags = [
+          ui.color('Name', :bold),
+          ui.color('Value', :bold),
+        ]
 
-      self.connection.servers.get(server).tags.each do |k, v|
-        tags << k
-        tags << v
-      end
+        self.connection.servers.get(server).tags.each do |k, v|
+          tags << k
+          tags << v
+        end
 
-      puts ui.list(tags, :uneven_columns_across, 2)
-      exit 0
-    rescue Excon::Errors::NotFound => e
-      puts ui.error("Server #{server} not found")
-      exit 1
+        puts ui.list(tags, :uneven_columns_across, 2)
+        exit 0
+      rescue Excon::Errors::NotFound => e
+        puts ui.error("Server #{server} not found")
+        exit 1
+      end
     end
   end
 end

data/lib/knife-joyent/version.rb

@@ -1,3 +1,3 @@
 module KnifeJoyent
-  VERSION = "0.0.10"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-joyent
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,23 +26,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.10.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.10.10
 description: Joyent CloudAPI Support for Chef's Knife Command
 email:
 - kevin@joyent.com
@@ -58,7 +58,7 @@ files:
 - README.md
 - Rakefile
 - knife-joyent.gemspec
-- lib/chef/knife/base.rb
+- lib/chef/knife/joyent_base.rb
 - lib/chef/knife/joyent_flavor_list.rb
 - lib/chef/knife/joyent_image_list.rb
 - lib/chef/knife/joyent_key_add.rb

data/lib/chef/knife/base.rb

@@ -1,58 +0,0 @@
-require 'chef/knife'
-
-module KnifeJoyent
-  module Base
-
-    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
-
-      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