knife-vcloud 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 Changes
+==
+2012-12-27 (0.2.1)
+--
+
+FIXES:
+* Change namespace to fix import error under 1.9.x (system-wide)
+
 ==
 2012-12-24 (0.2.0)
 --

data/README.md

@@ -1,4 +1,4 @@
-knife-vcloud
+knife-vcloud [![Dependency Status](https://gemnasium.com/astratto/knife-vcloud.png)](https://gemnasium.com/astratto/knife-vcloud)
 ===========
 
 DESCRIPTION

data/lib/chef/knife/vc_catalog_item_show.rb

@@ -16,73 +16,40 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcCatalogItemShow < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcCatalogItemShow < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc catalog item show [CATALOG_ID] (options)"
-
-    option :vcloud_url,
-           :short => "-H URL",
-           :long => "--vcloud-url URL",
-           :description => "The vCloud endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:vcloud_url] = url }
-
-    option :vcloud_user,
-           :short => "-U USER",
-           :long => "--vcloud-user USER",
-           :description => "Your vCloud User",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_user] = key }
+      banner "knife vc catalog item show [CATALOG_ID] (options)"
 
-    option :vcloud_password,
-           :short => "-P SECRET",
-           :long => "--vcloud-password SECRET",
-           :description => "Your vCloud secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_password] = key }
+      def run
+        $stdout.sync = true
 
-    option :vcloud_org,
-           :short => "-O ORGANIZATION",
-           :long => "--vcloud-organization ORGANIZATION",
-           :description => "Your vCloud Organization",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_org] = key }
+        item_id = @name_args.first
 
-    option :vcloud_api_version,
-           :short => "-A API_VERSION",
-           :long => "--vcloud-api-version API_VERSION",
-           :description => "vCloud API version (1.5 and 5.1 supported)",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
+        connection.login
 
-    def run
-      $stdout.sync = true
+        header = [
+            ui.color('Name', :bold),
+            ui.color('Template ID', :bold)
+        ]
 
-      item_id = @name_args.first
+        description, items = connection.show_catalog_item item_id
+        connection.logout
 
-      connection.login
+        puts "#{ui.color('Description:', :cyan)} #{description}"
+        list = header
+        list.flatten!
+        items.each do |k, v|
+          list << (k || '')
+          list << (v || '')
+        end
 
-      header = [
-          ui.color('Name', :bold),
-          ui.color('Template ID', :bold)
-      ]
-
-      description, items = connection.show_catalog_item item_id
-      connection.logout
-
-      puts "#{ui.color('Description:', :cyan)} #{description}"
-      list = header
-      list.flatten!
-      items.each do |k, v|
-        list << (k || '')
-        list << (v || '')
+        puts ui.list(list, :columns_across, 2)
       end
-
-      puts ui.list(list, :columns_across, 2)
     end
   end
 end

data/lib/chef/knife/vc_catalog_show.rb

@@ -16,73 +16,40 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcCatalogShow < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcCatalogShow < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc catalog show [CATALOG_ID] (options)"
-
-    option :vcloud_url,
-           :short => "-H URL",
-           :long => "--vcloud-url URL",
-           :description => "The vCloud endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:vcloud_url] = url }
-
-    option :vcloud_user,
-           :short => "-U USER",
-           :long => "--vcloud-user USER",
-           :description => "Your vCloud User",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_user] = key }
+      banner "knife vc catalog show [CATALOG_ID] (options)"
 
-    option :vcloud_password,
-           :short => "-P SECRET",
-           :long => "--vcloud-password SECRET",
-           :description => "Your vCloud secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_password] = key }
+      def run
+        $stdout.sync = true
 
-    option :vcloud_org,
-           :short => "-O ORGANIZATION",
-           :long => "--vcloud-organization ORGANIZATION",
-           :description => "Your vCloud Organization",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_org] = key }
+        catalog_id = @name_args.first
 
-    option :vcloud_api_version,
-           :short => "-A API_VERSION",
-           :long => "--vcloud-api-version API_VERSION",
-           :description => "vCloud API version (1.5 and 5.1 supported)",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
+        connection.login
 
-    def run
-      $stdout.sync = true
+        header = [
+            ui.color('Name', :bold),
+            ui.color('ID', :bold)
+        ]
 
-      catalog_id = @name_args.first
+        description, items = connection.show_catalog catalog_id
+        connection.logout
 
-      connection.login
+        puts "#{ui.color('Description:', :cyan)} #{description}"
+        list = header
+        list.flatten!
+        items.each do |k, v|
+          list << (k || '')
+          list << (v || '')
+        end
 
-      header = [
-          ui.color('Name', :bold),
-          ui.color('ID', :bold)
-      ]
-
-      description, items = connection.show_catalog catalog_id
-      connection.logout
-
-      puts "#{ui.color('Description:', :cyan)} #{description}"
-      list = header
-      list.flatten!
-      items.each do |k, v|
-        list << (k || '')
-        list << (v || '')
+        puts ui.list(list, :columns_across, 2)
       end
-
-      puts ui.list(list, :columns_across, 2)
     end
   end
 end

data/lib/chef/knife/vc_common.rb

@@ -0,0 +1,103 @@
+#
+# Author:: Stefano Tortarolo (<stefano.tortarolo@gmail.com>)
+# Copyright:: Copyright (c) 2012
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+
+class Chef
+  class Knife
+    # Module for operations common among commands
+    module VcCommon
+      # :nodoc:
+      # Would prefer to do this in a rational way, but can't be done b/c of
+      # Mixlib::CLI's design :(
+      def self.included(includer)
+        includer.class_eval do
+
+          deps do
+            require 'vcloud-rest/connection'
+            require 'chef/api_client'
+          end
+
+          option :vcloud_url,
+                 :short => "-H URL",
+                 :long => "--vcloud-url URL",
+                 :description => "The vCloud endpoint URL",
+                 :proc => Proc.new { |url| Chef::Config[:knife][:vcloud_url] = url }
+
+          option :vcloud_user,
+                 :short => "-U USER",
+                 :long => "--vcloud-user USER",
+                 :description => "Your vCloud User",
+                 :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_user] = key }
+
+          option :vcloud_password,
+                 :short => "-P SECRET",
+                 :long => "--vcloud-password SECRET",
+                 :description => "Your vCloud secret key",
+                 :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_password] = key }
+
+          option :vcloud_org,
+                 :short => "-O ORGANIZATION",
+                 :long => "--vcloud-organization ORGANIZATION",
+                 :description => "Your vCloud Organization",
+                 :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_org] = key }
+
+          option :vcloud_api_version,
+                 :short => "-A API_VERSION",
+                 :long => "--vcloud-api-version API_VERSION",
+                 :description => "vCloud API version (1.5 and 5.1 supported)",
+                 :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
+        end
+      end
+
+      def connection
+        unless @connection
+          @connection = VCloudClient::Connection.new(
+              locate_config_value(:vcloud_url),
+              locate_config_value(:vcloud_user),
+              locate_config_value(:vcloud_password),
+              locate_config_value(:vcloud_org),
+              locate_config_value(:vcloud_api_version)
+          )
+        end
+        @connection
+      end
+
+      def out_msg(label, value)
+        if value && !value.empty?
+          puts "#{ui.color(label, :cyan)}: #{value}"
+        end
+      end
+
+      def locate_config_value(key)
+        key = key.to_sym
+        Chef::Config[:knife][key] || config[key]
+      end
+
+      def wait_task(connection, task_id)
+        status, errormsg, start_time, end_time = connection.wait_task_completion task_id
+        puts "Done!"
+        out_msg("Summary", "Status: #{ui.color(status, :cyan)} - started at #{start_time} and ended at #{end_time}")
+
+        if errormsg
+          puts ui.color("ATTENTION: #{errormsg}", :red)
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/vc_login.rb

@@ -16,56 +16,23 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcLogin < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcLogin < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc login (options)"
-
-    option :vcloud_url,
-           :short => "-H URL",
-           :long => "--vcloud-url URL",
-           :description => "The vCloud endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:vcloud_url] = url }
-
-    option :vcloud_user,
-           :short => "-U USER",
-           :long => "--vcloud-user USER",
-           :description => "Your vCloud User",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_user] = key }
-
-    option :vcloud_password,
-           :short => "-P SECRET",
-           :long => "--vcloud-password SECRET",
-           :description => "Your vCloud secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_password] = key }
-
-    option :vcloud_org,
-           :short => "-O ORGANIZATION",
-           :long => "--vcloud-organization ORGANIZATION",
-           :description => "Your vCloud Organization",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_org] = key }
-
-    option :vcloud_api_version,
-           :short => "-A API_VERSION",
-           :long => "--vcloud-api-version API_VERSION",
-           :description => "vCloud API version (1.5 and 5.1 supported)",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
+      banner "knife vc login (options)"
 
-    def run
-      $stdout.sync = true
+      def run
+        $stdout.sync = true
 
-      connection.login
-      out_msg("Authenticated successfully, code", connection.auth_key)
+        connection.login
+        out_msg("Authenticated successfully, code", connection.auth_key)
 
-      connection.logout
+        connection.logout
+      end
     end
   end
-end
+end

data/lib/chef/knife/vc_org_list.rb

@@ -16,66 +16,33 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/vc_common'
 
-module KnifeVCloud
-  class VcOrgList < Chef::Knife
-    include KnifeVCloud::Common
+class Chef
+  class Knife
+    class VcOrgList < Chef::Knife
+      include Knife::VcCommon
 
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc org list (options)"
-
-    option :vcloud_url,
-           :short => "-H URL",
-           :long => "--vcloud-url URL",
-           :description => "The vCloud endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:vcloud_url] = url }
-
-    option :vcloud_user,
-           :short => "-U USER",
-           :long => "--vcloud-user USER",
-           :description => "Your vCloud User",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_user] = key }
-
-    option :vcloud_password,
-           :short => "-P SECRET",
-           :long => "--vcloud-password SECRET",
-           :description => "Your vCloud secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_password] = key }
-
-    option :vcloud_org,
-           :short => "-O ORGANIZATION",
-           :long => "--vcloud-organization ORGANIZATION",
-           :description => "Your vCloud Organization",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_org] = key }
-
-    option :vcloud_api_version,
-           :short => "-A API_VERSION",
-           :long => "--vcloud-api-version API_VERSION",
-           :description => "vCloud API version (1.5 and 5.1 supported)",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
+      banner "knife vc org list (options)"
 
-    def run
-      $stdout.sync = true
+      def run
+        $stdout.sync = true
 
-      list = [
-          ui.color('Name', :bold),
-          ui.color('ID', :bold)
-      ]
+        list = [
+            ui.color('Name', :bold),
+            ui.color('ID', :bold)
+        ]
 
-      connection.login
-      org_list = connection.list_organizations
-      connection.logout
+        connection.login
+        org_list = connection.list_organizations
+        connection.logout
 
-      org_list.each do |k, v|
-        list << (k || '')
-        list << (v || '')
+        org_list.each do |k, v|
+          list << (k || '')
+          list << (v || '')
+        end
+        puts ui.list(list, :columns_across, 2)
       end
-      puts ui.list(list, :columns_across, 2)
     end
   end
 end

data/lib/chef/knife/vc_org_show.rb

@@ -16,97 +16,64 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
-
-module KnifeVCloud
-  class VcOrgShow < Chef::Knife
-    include KnifeVCloud::Common
-
-    deps do
-      require 'vcloud-rest/connection'
-      require 'chef/api_client'
-    end
-
-    banner "knife vc org show [ORG_ID] (options)"
-
-    option :vcloud_url,
-           :short => "-H URL",
-           :long => "--vcloud-url URL",
-           :description => "The vCloud endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:vcloud_url] = url }
-
-    option :vcloud_user,
-           :short => "-U USER",
-           :long => "--vcloud-user USER",
-           :description => "Your vCloud User",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_user] = key }
-
-    option :vcloud_password,
-           :short => "-P SECRET",
-           :long => "--vcloud-password SECRET",
-           :description => "Your vCloud secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_password] = key }
-
-    option :vcloud_org,
-           :short => "-O ORGANIZATION",
-           :long => "--vcloud-organization ORGANIZATION",
-           :description => "Your vCloud Organization",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_org] = key }
-
-    option :vcloud_api_version,
-           :short => "-A API_VERSION",
-           :long => "--vcloud-api-version API_VERSION",
-           :description => "vCloud API version (1.5 and 5.1 supported)",
-           :proc => Proc.new { |key| Chef::Config[:knife][:vcloud_api_version] = key }
-
-    def run
-      $stdout.sync = true
-
-      org_id = @name_args.first
-
-      connection.login
-
-      header = [
-          ui.color('Name', :bold),
-          ui.color('ID', :bold)
-      ]
-
-      catalogs, vdcs, networks, tasklists = connection.show_organization org_id
-      connection.logout
-
-      list = ["#{ui.color('CATALOGS', :cyan)}", '']
-      list << header
-      list.flatten!
-      catalogs.each do |k, v|
-        list << (k || '')
-        list << (v || '')
-      end
-
-      list << ['', '', "#{ui.color('VDCs', :cyan)}", '']
-      list << header
-      list.flatten!
-      vdcs.each do |k, v|
-        list << (k || '')
-        list << (v || '')
+require 'chef/knife/vc_common'
+
+class Chef
+  class Knife
+    class VcOrgShow < Chef::Knife
+      include Knife::VcCommon
+
+      banner "knife vc org show [ORG_ID] (options)"
+
+      def run
+        $stdout.sync = true
+
+        org_id = @name_args.first
+
+        connection.login
+
+        header = [
+            ui.color('Name', :bold),
+            ui.color('ID', :bold)
+        ]
+
+        catalogs, vdcs, networks, tasklists = connection.show_organization org_id
+        connection.logout
+
+        list = ["#{ui.color('CATALOGS', :cyan)}", '']
+        list << header
+        list.flatten!
+        catalogs.each do |k, v|
+          list << (k || '')
+          list << (v || '')
+        end
+
+        list << ['', '', "#{ui.color('VDCs', :cyan)}", '']
+        list << header
+        list.flatten!
+        vdcs.each do |k, v|
+          list << (k || '')
+          list << (v || '')
+        end
+
+        list << ['', '', "#{ui.color('NETWORKS', :cyan)}", '']
+        list << header
+        list.flatten!
+        networks.each do |k, v|
+          list << (k || '')
+          list << (v || '')
+        end
+
+        list << ['', '', "#{ui.color('TASKLISTS', :cyan)}", '']
+        list << header
+        list.flatten!
+        tasklists.each do |k, v|
+          list << (k || '<unnamed list>')
+          list << (v || '')
+        end
+
+        puts ui.list(list, :columns_across, 2)
       end
-
-      list << ['', '', "#{ui.color('NETWORKS', :cyan)}", '']
-      list << header
-      list.flatten!
-      networks.each do |k, v|
-        list << (k || '')
-        list << (v || '')
-      end
-
-      list << ['', '', "#{ui.color('TASKLISTS', :cyan)}", '']
-      list << header
-      list.flatten!
-      tasklists.each do |k, v|
-        list << (k || '<unnamed list>')
-        list << (v || '')
-      end
-
-      puts ui.list(list, :columns_across, 2)
     end
   end
-end
+end