knife-voxel 0.0.6 → 0.0.7

data/lib/chef/knife/voxel_base.rb

@@ -21,18 +21,53 @@ class Chef
             :long        => "--voxel-api-secret SECRET",
             :description => "Voxel hAPI Secret",
             :proc        => Proc.new { |secret| Chef::Config[:knife][:voxel_api_secret] = secret }
+
+          option :voxel_api_username,
+            :long        => "--voxel-api-username USERNAME",
+            :description => "Voxel hAPI Username",
+            :proc        => Proc.new { |username| Chef::Config[:knife][:voxel_api_username] = username }
+
+          option :voxel_api_password,
+            :long        => "--voxel-api-password PASSWORD",
+            :description => "Voxel hAPI Password",
+            :proc        => Proc.new { |password| Chef::Config[:knife][:voxel_api_password] = password }
+
+
         end
       end
 
       def hapi
         @hapi ||= begin
-          hapi = HAPI.new(
-            :useauthkey     => true,
-            :username       => Chef::Config[:knife][:voxel_api_key],
-            :password       => Chef::Config[:knife][:voxel_api_secret],
-            :default_format => :ruby,
-            :debug          => false
-          )
+          if Chef::Config[:knife].has_key?(:voxel_api_username)
+            unless Chef::Config[:knife].has_key?(:voxel_api_password)
+              ui.error( "--voxel-api-password is required when using --voxel-api-username" )
+              exit 1
+            end
+
+            hapi = HAPI.new(
+              :useauthkey     => false,
+              :username       => Chef::Config[:knife][:voxel_api_username],
+              :password       => Chef::Config[:knife][:voxel_api_password],
+              :default_format => :ruby,
+              :debug          => false
+            )
+          elsif Chef::Config[:knife].has_key?(:voxel_api_key)
+            unless Chef::Config[:knife].has_key?(:voxel_api_secret)
+              ui.error( "--voxel-api-secret is required when using --voxel-api-key" )
+              exit 1
+            end
+
+            hapi = HAPI.new(
+              :useauthkey     => true,
+              :username       => Chef::Config[:knife][:voxel_api_key],
+              :password       => Chef::Config[:knife][:voxel_api_secret],
+              :default_format => :ruby,
+              :debug          => false
+            )
+          else
+            ui.error( "--voxel-api-key or --voxel-api-username must be specified" )
+            exit 1
+          end
         end
       end
     end

data/lib/knife-voxel/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Voxel
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-voxel
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-15 00:00:00.000000000Z
+date: 2011-10-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: voxel-hapi
-  requirement: &10910840 !ruby/object:Gem::Requirement
+  requirement: &19478320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.1.10
   type: :runtime
   prerelease: false
-  version_requirements: *10910840
+  version_requirements: *19478320
 description: Voxel hAPI Support for Chef's knife command
 email:
 - jwb@voxel.net