mccloud 0.0.19 → 0.0.20

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d3c2125a74e7e9ced5ad67344fd4a9876a2a0017
+  data.tar.gz: c0316c730d6ddecb541d33fb3b5f81471b44ebb1
+SHA512:
+  metadata.gz: 10ad1af8d9e4ad7912ad9bddac9dea49b2030f7417fa1e4ad1cea8ac38928ef8e9f67fe2124ed075b3287228c4b4cd9c5d8b2830cf815f7f41434ed6462e093c
+  data.tar.gz: bce3be34d62f499937e34694d53d8ecfea535fa55ef170262e99c62b274715f4d15d722bbcd11d187019cdd995b1f2c37e01fd97d952a50e5765cfd17cc600b9

data/.rvmrc

@@ -1,4 +1,4 @@
-rvm use ruby-1.8.7
+rvm use ruby-2.0
 #rvm use ruby-1.9.2
 rvm gemset use mccloud
 alias mccloud="bundle exec mccloud"

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.2-p320
+  - 1.9.3
+  - 2.0
+notifications:
+  irc: "chat.freenode.net#mccloud"

data/README.md

@@ -3,6 +3,8 @@
 # About
 ## What the hell is mccloud?
 
+[![Build Status](https://travis-ci.org/jedi4ever/mccloud.png)](https://travis-ci.org/jedi4ever/mccloud)
+
 Over the years I fell in love with [Vagrant](http://vagrantup.com) and wanted to have the same workflow for ec2, kvm,  internal clouds etc..
 
 Therefore Mccloud aims to be the equivalent of ``vagrant`` but extending it to use providers:

data/Rakefile

@@ -1,8 +1,8 @@
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 
-#desc 'Default: run tests'
-#task :default => :test
+desc 'Default: run tests'
+task :default => :test
 
 require 'rake'
 require 'rspec/core/rake_task'

data/lib/mccloud/provider/aws/provider/status.rb

@@ -20,7 +20,7 @@ module Mccloud::Provider
           if name.start_with?(self.filter)
             unless self.filter==""
               name[self.filter]=""
-              printf "%-10s %-12s %-20s %-20s %-15s %-8s\n",name,vm.id, vm.public_ip_address, vm.private_ip_address,vm.flavor.name,vm.state
+              printf "%-10s %-12s %-20s %-20s %-15s %-8s\n",name,vm.id, vm.public_ip_address, vm.private_ip_address,vm.flavor_id,vm.state
             else
               env.ui.info "Name: #{name}"
               env.ui.info "Instance Id: #{vm.id}"

data/lib/mccloud/provider/core/vm/ssh_bootstrap.rb

@@ -6,9 +6,9 @@ module Mccloud
     module Core
       module VmCommand
 
-        def ssh_bootstrap(command,bootstrap_options=nil)
+        def ssh_bootstrap(command,bootstrap_options= {})
           begin
-            options = bootstrap_options.dup
+            options = Hash.new
 
             options[:port] = @port
 
@@ -34,7 +34,7 @@ module Mccloud
                   rescue Net::SSH::AuthenticationFailed
                     raise ::Mccloud::Error, "[#{@name}] - Authentication problem \n"
                   rescue Exception => ex
-                    raise ::Mccloud::Error, "[#{@name}] - Error uploading file #{full_scriptname} #{ex.to_s}\n"
+                    raise ::Mccloud::Error, "[#{@name}] - Error uploading file #{full_scriptname} #{ex.inspect}\n"
                   end
                   env.ui.info "[#{@name}] - Enabling the bootstrap code to run"
                   result=self.execute("chmod +x /tmp/bootstrap.sh && #{self.sudo_string("/tmp/bootstrap.sh",options)}",options)

data/lib/mccloud/provisioner/chef_solo.rb

@@ -44,6 +44,7 @@ module Mccloud
         @name ="chef_solo"
         @log_level="info"
         @cookbooks_path =  []
+        @run_list = []
         @clean_after_run = true
       end
 
@@ -80,12 +81,14 @@ module Mccloud
           #JSON.parse result = Hash
           #.to_json = String containing JSON formatting of Hash
 
-          json=JSON.parse(result).to_json
+          @json.merge!(JSON.parse(result))
 
         else
-          json=@json.to_json
         end
 
+        @json.merge!({:run_list => @run_list })
+        json=@json.to_json
+
         cooks=Array.new
         @cookbooks_path.each do |cook|
           cooks << File.join("/tmp/"+File.basename(cook))
@@ -178,17 +181,13 @@ module Mccloud
       def run_list
         json[:run_list] ||= []
       end
-      # Sets the run list to the specified value
-      def run_list=(value)
-        json[:run_list] = value
-      end
       def add_role(name)
         name = "role[#{name}]" unless name =~ /^role\[(.+?)\]$/
-        run_list << name
+        @run_list << name
       end
       def add_recipe(name)
         name = "recipe[#{name}]" unless name =~ /^recipe\[(.+?)\]$/
-        run_list << name
+        @run_list << name
       end
 
       def setup_config(template, filename, template_vars)

data/lib/mccloud/version.rb

@@ -2,5 +2,5 @@ module Mccloud
 end
 
 unless defined?(Mccloud::VERSION)
-  ::Mccloud::VERSION = "0.0.19"
+  ::Mccloud::VERSION = "0.0.20"
 end

data/mccloud.gemspec

@@ -14,10 +14,11 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "mccloud"
 
-  s.add_dependency "net-ssh", "~> 2.2.2"
+  s.add_dependency "net-ssh", ">= 2.2.2"
   #s.add_dependency "sshkey"
   s.add_dependency "net-scp"
-   s.add_dependency "fog", ">= 1.1.0"
+   s.add_dependency "fog", "~> 1.9.0"
+   s.add_dependency "excon", "0.24.0"
 
   s.add_dependency "json"
   s.add_dependency "ansi"

metadata

@@ -1,248 +1,237 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mccloud
-version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 19
-  version: 0.0.19
+version: !ruby/object:Gem::Version
+  version: 0.0.20
 platform: ruby
-authors: 
+authors:
 - Patrick Debois
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-01-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 2.2.2
-  prerelease: false
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-scp
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: fog
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.24.0
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.24.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: ansi
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ansi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: popen4
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.1.2
-  prerelease: false
   type: :runtime
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
   name: thor
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 14
-        - 6
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.14.6
-  prerelease: false
   type: :runtime
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.14.6
+- !ruby/object:Gem::Dependency
   name: highline
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
-  prerelease: false
   type: :runtime
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  name: net-ssh-multi
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: net-ssh-multi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  prerelease: false
   type: :development
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: ruby-libvirt
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.4.0
-  prerelease: false
   type: :development
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
   name: vagrant
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 61
-        segments: 
-        - 0
-        - 8
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.8.1
-  prerelease: false
   type: :development
-  requirement: *id012
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  requirement: *id013
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id014
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use the same simple commandline api to manage cloud interfaces
-email: 
+email:
 - patrick.debois@jedi.be
-executables: 
+executables:
 - mccloud
 - mccloud_old
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Guardfile
 - README.md
@@ -449,38 +438,25 @@ files:
 - templates/ubuntu-10.10-server-amd64/mccloud.erb
 homepage: http://github.com/jedi4ever/mccloud/
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: mccloud
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Cloud integration vagrant style
 test_files: []
-