mystro-common 0.3.1 → 0.3.3.rc0

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ### Changelog
 
+##### v0.3.3.rc0:
+* clean up plugin handling for gem-based plugins. minor tweak to compute.volume processing (this needs more work)
+* some debug logging and tweaks around compute volumes
+
+##### v0.3.2:
+* use the released version of crackin
+
 ##### v0.3.1:
 * crackin release working: FIRST! :)
 

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'damsel', path: '../../damsel'
-gem 'crackin', path: '../../crackin'
+gem 'crackin'
 
 gem 'rake', '10.0.4'
 gem 'awesome_print'

data/lib/mystro/cloud/connect/aws/compute.rb

@@ -82,13 +82,15 @@ module Mystro
           devices = map.keys
           last = devices.last
           root = image.root_device_name
+          Mystro::Log.debug "ROOT: #{root.inspect}"
           model.volumes.each do |volume|
+            Mystro::Log.debug "VOLUME: #{volume.inspect}"
             dev = volume.device || volume.name
-            if dev == :root && image.root_device_type != "ebs"
-              Mystro::Log.error "trying to change ephemeral root volume"
-              return
-            end
             if dev == :root || dev == 'root'
+              if image.root_device_type != "ebs"
+                Mystro::Log.error "trying to change ephemeral root volume"
+                raise "trying to change ephemeral root volume"
+              end
               dev = root
               unless map[dev]
                 Mystro::Log.error "something wrong, trying to change root volume: #{volume.inspect}"
@@ -113,10 +115,11 @@ module Mystro
                   'virtualName' => volume.virtual,
               }
             else
-              map[dev]['volumeSize'] = volume.size.to_s if volume.size
+              map[dev]['volumeSize'] = volume.size.to_s if volume.size.to_i > 0
               map[dev]['snapshotId'] = volume.snapshot if volume.snapshot
               map[dev]['deleteOnTermination'] = volume.dot if volume.dot
             end
+            Mystro::Log.debug "VOLUME: => (#{dev}) #{map[dev].inspect}"
           end
           change_keys(map_untransform(map))
         end

data/lib/mystro/common/version.rb

@@ -3,8 +3,8 @@ module Mystro
     module Version
       MAJOR = 0
       MINOR = 3
-      TINY = 1
-      TAG = nil
+      TINY = 3
+      TAG = 'rc0'
       LIST  = [MAJOR, MINOR, TINY, TAG]
       STRING = LIST.compact.join(".")
     end

data/lib/mystro/plugin.rb

@@ -26,13 +26,28 @@ module Mystro
       def load(plugins={ })
         list = plugins.reject {|k, v| k == 'disabled'}
         list.each do |plugin, data|
-          begin
-            f = "#{Mystro.directory}/plugins/#{plugin}"
-            Mystro::Log.debug "loading plugin: #{plugin} #{f}"
-            require f
-          rescue LoadError, StandardError => e
-            Mystro::Log.error "error while loading plugin: #{plugin}: #{e.message} at #{e.backtrace.first}"
+          load_plugin(plugin, data)
+        end
+      end
+
+      def load_plugin(plugin, data)
+        begin
+          # load library, if it exists
+          # this is for plugins in gems
+          require "mystro/plugin/#{plugin}"
+        rescue => e
+          Mystro::Log.debug "load plugin: #{plugin}: #{e.message}"
+        end
+
+        begin
+          # load file in config directory if it exists
+          file = "#{Mystro.directory}/plugins/#{plugin}"
+          if File.exists?("#{file}.rb")
+            Mystro::Log.debug "plugin: #{plugin} = #{file}"
+            require file
           end
+        rescue LoadError, StandardError => e
+          Mystro::Log.error "load plugin: #{plugin}: #{e.message}"
         end
       end
 

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: mystro-common
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3.rc0
+  prerelease: 6
 platform: ruby
 authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yell
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: damsel
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -193,26 +210,30 @@ files:
 - test/config.yml
 homepage: http://github.com/mystro
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2211444181715532034
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: common functionality for Mystro
 test_files:
 - spec/cloud/aws/balancer_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDE3ZjdiMzBkZGZhMjBhNzk4NjdlZWIxYTMxYzg0ZWU3MjExMzEzNA==
-  data.tar.gz: !binary |-
-    M2M5NmJhY2MzZGM1OTU2ZjM0MGYzMjJkNjUxNTgyYWE1NWM0NGMyNQ==
-SHA512:
-  metadata.gz: !binary |-
-    M2QzY2Y3NjlkZWRjOWQwOThhZmFmMjJlZTkyMjNjZWY2Zjk4MDFhODA2ZWUz
-    MTc4ZGY3MGQ5ODRlZGU1MmYyN2M1YTliYTVlOWQ2M2EwZTFiNzk0YjQxYjQw
-    YTYyOGNlZjRiYjE5NGZkMzU1NGI4OTViMWJkYjcwZGFiMmM3ZmI=
-  data.tar.gz: !binary |-
-    NjhhYTBlM2IxYjliMGZhYTc3ODMyODViMjAwZmU4MTU3YWQzZTA1ODk0MGQw
-    YTM3ZWJiZGEyMjQ0ZGQ4YTVlMTk5ZTc4ODcxMTY5OTFhNDY0OTcwY2Q1YmQ5
-    MzZiZjEyODE3YTgxN2RiZjhhZDE0MDA5ZWVmMzA0ODNkNmM0MWM=