mystro-common 0.1.4 → 0.1.5

data/lib/mystro/account.rb

@@ -2,9 +2,17 @@ module Mystro
   class Account
     class << self
       #attr_reader :name
-      attr_reader :list
+      #attr_reader :list
       attr_reader :selected
 
+      def [](name)
+        get(name)
+      end
+
+      def get(name)
+        @list[name]
+      end
+
       def read
         dir   = Mystro.directory
         @list = { }

data/lib/mystro/common/version.rb

@@ -3,7 +3,7 @@ module Mystro
     module Version
       MAJOR = 0
       MINOR = 1
-      TINY  = 4
+      TINY  = 5
       TAG   = nil
       STRING = [MAJOR, MINOR, TINY, TAG].compact.join(".")
     end

data/lib/mystro/connect/dns.rb

@@ -9,12 +9,17 @@ module Mystro
         all.select {|e| [*e.value].flatten.include?(dns)}
       end
 
+      def find_by_name(name)
+        connection.zones.all.detect {|e| e.domain == name}
+      end
+
       # customize the connect function, because we are defaulting
       # to the zone from the configuration
       def connect
         @fog ||= begin
-          raise "could not connect to DNS; #{opt.to_hash.inspect}; #{cfg.to_hash.inspect}" unless opt && cfg.zone
-          zone(cfg.zone)
+          raise "must set zone" unless cfg.zone
+          raise "must set options" unless opt
+          find_by_name(cfg.zone)
         end
       rescue => e
         Mystro::Log.error "DNS connect failed: #{e.message} at #{e.backtrace.first}"
@@ -30,11 +35,12 @@ module Mystro
       end
 
       def zone(name)
-        z = connection.zones.get(name)
-        raise("zone #{name} not found") unless z
+        n = "#{name}."
+        z = connection.zones.get(n)
+        raise("zone #{n} not found") unless z
         z
       rescue => e
-        raise("problem retrieving zone #{name}: #{e.message} at #{e.backtrace.first}")
+        raise("#{e.message} at #{e.backtrace.first}")
       end
 
       def create_zone(model)
@@ -42,4 +48,4 @@ module Mystro
       end
     end
   end
-end
+end

data/lib/mystro/plugin.rb

@@ -57,13 +57,13 @@ module Mystro
 
       def jobs
         @jobs ||= begin
-          jobs = []
+          jobs = {}
           (@plugins||{}).each do |key, opts|
             if opts[:jobs]
-              jobs << opts[:jobs]
+              jobs[key] = opts[:jobs]
             end
           end
-          jobs.flatten
+          jobs
         end
       end
 

data/lib/mystro-common.rb

@@ -16,7 +16,7 @@ module Mystro
     end
 
     def current_account
-      Mystro::Account.list[selected]
+      Mystro::Account.get(selected)
     end
 
     def directory

data/mystro-common.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "fog", "~> 1.12.1"       # talk to cloud
-  gem.add_dependency "yell", "~> 1.2.0"       # logging
-  gem.add_dependency "hashie"                 # better data objects
-  gem.add_dependency "activesupport", "3.2.8" # active support
-  gem.add_dependency "ipaddress"              # ip address library
-  gem.add_dependency "erubis"                 # userdata templates
+  gem.add_dependency "fog", "~> 1.12.1"        # talk to cloud
+  gem.add_dependency "yell", "~> 1.2.0"        # logging
+  gem.add_dependency "hashie"                  # better data objects
+  gem.add_dependency "activesupport", "3.2.14" # active support
+  gem.add_dependency "ipaddress"               # ip address library
+  gem.add_dependency "erubis"                  # userdata templates
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mystro-common
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
@@ -151,18 +151,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -618115457408293498
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -618115457408293498
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25