virtualmaster 0.1.4 → 0.1.5

data/.gitignore

@@ -3,3 +3,4 @@
 pkg/*
 vendor/bundle
 vendor/cache
+coverage

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    virtualmaster (0.1.3)
+    virtualmaster (0.1.4)
       commander (~> 4.1.2)
       deltacloud-client (~> 0.5.0)
       net-ssh (~> 2.3.0)
@@ -16,8 +16,9 @@ GEM
       nokogiri (>= 1.4.3)
       rest-client (>= 1.6.1)
     diff-lcs (1.1.3)
-    highline (1.6.11)
+    highline (1.6.12)
     mime-types (1.18)
+    multi_json (1.3.5)
     net-ssh (2.3.0)
     nokogiri (1.5.2)
     rest-client (1.6.7)
@@ -30,6 +31,12 @@ GEM
     rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    simplecov-rcov (0.2.3)
+      simplecov (>= 0.4.1)
     terminal-table (1.4.5)
 
 PLATFORMS
@@ -37,4 +44,6 @@ PLATFORMS
 
 DEPENDENCIES
   rspec (~> 2)
+  simplecov
+  simplecov-rcov
   virtualmaster!

data/bin/virtualmaster

@@ -17,6 +17,10 @@ program :help_formatter, :compact
 
 default_command :help
 
+global_option '-c', '--config FILE', String, 'Config file to use (~/.virtualmaster is default)' do |file|
+  VirtualMaster::CLI.config_file(file)
+end
+
 VirtualMaster::CLI.run do
   # load callback
   callback_files = File.join(File.dirname(__FILE__), "../lib/vmaster/callbacks/*.rb")
@@ -32,5 +36,3 @@ VirtualMaster::CLI.run do
 end
 
 Commander::Runner.instance.run!
-
-

data/lib/vmaster/cli.rb

@@ -3,41 +3,52 @@ require 'deltacloud'
 
 module VirtualMaster
   class CLI
+    @@config_file = nil
     @@api = nil
     @@config = nil
     @@callbacks = []
 
     def self.run
-      # load config
-      config_file = File.join(ENV["HOME"], ".virtualmaster")
-      if File.exists? config_file
-        config = YAML::load(File.open(config_file))
-
-        @@config = config.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-
-        unless @@config[:profiles]
-          puts "WARNING: Please, reconfigure virtualmaster-cli (delete your '~/.virtualmaster' and run `virtualmaster config` again). This way you can use custom instance profiles correctly (new in version 0.0.5)"
-          puts
-        end
-
-        begin
-          @@api = DeltaCloud.new(@@config[:username], @@config[:password], VirtualMaster::DEFAULT_URL)
-        rescue DeltaCloud::API::BackendError => e
-          abort "Invalid API response: #{e.message}"
-        rescue Exception => e
-          abort "Unable to connect to Virtualmaster's DeltaCloud API: #{e.message}" 
-        end
-      end
+      @@config_file = File.join(ENV["HOME"], ".virtualmaster")
 
       yield
     end
 
+    def self.config_file(config)
+      @@config_file = config
+    end
+
     def self.api
+      self.config unless @@config
+
       abort "No configuration available! Please run 'virtualmaster config' first!" unless @@api
       @@api
     end
 
     def self.config
+      unless @@config
+        if File.exists? @@config_file
+          config = YAML::load(File.open(@@config_file))
+
+          @@config = config.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+
+          unless @@config[:profiles]
+            puts "WARNING: Please, reconfigure virtualmaster-cli (delete your '~/.virtualmaster' and run `virtualmaster config` again). This way you can use custom instance profiles correctly (new in version 0.0.5)"
+            puts
+          end
+
+          begin
+            @@api = DeltaCloud.new(@@config[:username], @@config[:password], VirtualMaster::DEFAULT_URL)
+          rescue DeltaCloud::API::BackendError => e
+            abort "Invalid API response: #{e.message}"
+          rescue Exception => e
+            abort "Unable to connect to Virtualmaster's DeltaCloud API: #{e.message}" 
+          end
+        else 
+          abort "Specified configuration file (#{config_file}) does not exist!"
+        end
+      end
+
       @@config
     end
 

data/lib/vmaster/version.rb

@@ -1,5 +1,5 @@
 module VirtualMaster
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 
   def self.cli_spec_version
     VERSION.to_f.to_s

data/spec/commands_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "VirtualMaster commands" do
+describe "VirtualMaster CLI" do
   before :each do
     @runner = Commander::Runner.instance
   end

data/spec/deltacloud_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'deltacloud'
+require 'vmaster/helpers'
+
+describe "DeltaCloud API integration" do
+  it "should return HTTP 401 when called without valid credentials" do
+    lambda {
+      DeltaCloud.new(nil,nil, VirtualMaster::DEFAULT_URL)
+    }.should raise_error(DeltaCloud::API::BackendError, "401 : Not authorized / Invalid credentials")
+  end
+end

data/spec/spec_helper.rb

@@ -1,7 +1,23 @@
 $:.unshift File.dirname(__FILE__) + '/../lib'
 
+if ENV['COVERAGE']
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+
+  SimpleCov.start do
+    add_filter '/vendor'
+    add_filter '/spec'
+  end
+end
+
 require 'vmaster'
 
+# manually load commands
+require 'vmaster/config_command'
+require 'vmaster/server_commands'
+
 program :name, "virtualmaster"
 program :version, VirtualMaster::VERSION
 program :description, "Virtualmaster command line interface"
@@ -11,3 +27,5 @@ default_command :test
 
 command :test do |c|
 end
+
+

data/virtualmaster.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |s|
   s.add_dependency "net-ssh", "~> 2.3.0"
 
   s.add_development_dependency "rspec", "~> 2"
+  s.add_development_dependency "simplecov"
+  s.add_development_dependency "simplecov-rcov"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: virtualmaster
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70276151073440 !ruby/object:Gem::Requirement
+  requirement: &70110396604660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 4.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70276151073440
+  version_requirements: *70110396604660
 - !ruby/object:Gem::Dependency
   name: deltacloud-client
-  requirement: &70276151071480 !ruby/object:Gem::Requirement
+  requirement: &70110396603860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70276151071480
+  version_requirements: *70110396603860
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &70276151069480 !ruby/object:Gem::Requirement
+  requirement: &70110396603080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70276151069480
+  version_requirements: *70110396603080
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70276151067760 !ruby/object:Gem::Requirement
+  requirement: &70110396602420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70276151067760
+  version_requirements: *70110396602420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70276151065760 !ruby/object:Gem::Requirement
+  requirement: &70110396601400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,29 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70276151065760
+  version_requirements: *70110396601400
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70110396600160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70110396600160
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: &70110396598020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70110396598020
 description: Command line interface to Virtualmaster. Control your virtual infrastructure.
 email:
 - radim@laststation.net
@@ -92,6 +114,7 @@ files:
 - lib/vmaster/server_commands.rb
 - lib/vmaster/version.rb
 - spec/commands_spec.rb
+- spec/deltacloud_spec.rb
 - spec/spec_helper.rb
 - virtualmaster.gemspec
 homepage: https://github.com/virtualmaster/virtualmaster-cli
@@ -120,4 +143,5 @@ specification_version: 3
 summary: Command line interface to Virtualmaster
 test_files:
 - spec/commands_spec.rb
+- spec/deltacloud_spec.rb
 - spec/spec_helper.rb