mystro-common 0.1.2 → 0.1.3

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p448@mystro

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+
+## v0.1.3:
+* fixes bugs with dns usage and plugin methods when no plugins are defined
+* update ruby version
+* lock activesupport to same version as rails for mystro/server
+* ruby-version, changelog task and add rake to Gemfile
+* merge release v0.1.2
+* new DSL framework
+* ruby version file
+* changelog rake tasks
+
+## v0.1.2:
+* new plugin support code for mystro-volley integration
+* new DSL framework
+* ruby version file
+* changelog rake tasks
+
+## v0.1.1:
+* new DSL framework
+* ruby version file
+

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mystro-common.gemspec
 gemspec
+
+gem "rake"

data/Rakefile

@@ -1 +1,51 @@
 require "bundler/gem_tasks"
+
+def changelog(last=nil, single=false)
+  command="git --no-pager log --format='%an::::%h::::%s'"
+
+  list = `git tag`
+
+  puts "# Changelog"
+  puts
+
+  ordered = list.lines.sort_by {|e| (a,b,c) = e.gsub(/^v/,"").split("."); "%3d%3d%3d" % [a, b, c]}
+
+  ordered.reject{|e| (a,b,c,d) = e.split("."); !d.nil?}.reverse_each do |t|
+    tag = t.chomp
+
+    if last
+      check = { }
+      out   = []
+      log   = `#{command} #{last}...#{tag}`
+      log.lines.each do |line|
+        (who, hash, msg) = line.split('::::')
+        unless check[msg]
+          unless msg =~ /^Merge branch/ || msg =~ /CHANGELOG/ || msg =~ /^(v|version|changes for|preparing|ready for release|ready to release|bump version)*\s*(v|version)*\d+\.\d+\.\d+/
+            msg.gsub(" *", "\n*").gsub(/^\*\*/, "  *").lines.each do |l|
+              line = l =~ /^(\s+)*\*/ ? l : "* #{l}"
+              out << line
+            end
+            check[msg] = hash
+          end
+        end
+      end
+      puts "## #{last}:"
+      out.each { |e| puts e }
+      #puts log
+      puts
+    end
+
+    last = tag
+    exit if single
+  end
+end
+
+desc "generate changelog output"
+task :changelog do
+  changelog
+end
+
+desc "show current changes (changelog output from HEAD to most recent tag)"
+task :current do
+  changelog("HEAD",true)
+end

data/lib/mystro-common.rb

@@ -11,6 +11,7 @@ module Mystro
     end
 
     def account
+      raise "mystro account unset! default account ('#{config.default_account}') doesn't exist?" unless current_account
       current_account.data
     end
 

data/lib/mystro/common/version.rb

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

data/lib/mystro/connect.rb

@@ -62,7 +62,8 @@ module Mystro
       end
 
       def connect
-        @fog ||= model.new(opt) if opt
+        #puts "connect: #{model}.new(#{opt.to_hash.symbolize_keys})"
+        @fog ||= model.new(opt.to_hash.symbolize_keys) if opt
       rescue => e
         Mystro::Log.error "#{cname} connect failed: #{e.message} at #{e.backtrace.first}"
       end

data/lib/mystro/connect/dns.rb

@@ -14,24 +14,31 @@ module Mystro
       def connect
         @fog ||= begin
           raise "could not connect to DNS; #{opt.to_hash.inspect}; #{cfg.to_hash.inspect}" unless opt && cfg.zone
-          dns = Fog::DNS.new(opt)
-          dns.zones.find(cfg.zone).first
+          zone(cfg.zone)
         end
       rescue => e
         Mystro::Log.error "DNS connect failed: #{e.message} at #{e.backtrace.first}"
         Mystro::Log.error e
       end
 
+      def connection
+        Fog::DNS.new(opt.to_hash.symbolize_keys)
+      end
+
       def zones
-        Fog::DNS.new(opt).zones.all
+        connection.zones.all
       end
 
       def zone(name)
-        Fog::DNS.new(opt).zones.find(name).first
+        z = connection.zones.get(name)
+        raise("zone #{name} not found") unless z
+        z
+      rescue => e
+        raise("problem retrieving zone #{name}: #{e.message} at #{e.backtrace.first}")
       end
 
       def create_zone(model)
-        Fog::DNS.new(opt).zones.create(model.fog_options)
+        connection.zones.create(model.fog_options)
       end
     end
   end

data/lib/mystro/plugin.rb

@@ -45,7 +45,7 @@ module Mystro
       def ui
         @ui ||= begin
           ui = {}
-          @plugins.each do |key, opts|
+          (@plugins||{}).each do |key, opts|
             if opts[:ui]
               n = opts[:name]
               ui[n] = opts[:ui]
@@ -58,7 +58,7 @@ module Mystro
       def jobs
         @jobs ||= begin
           jobs = []
-          @plugins.each do |key, opts|
+          (@plugins||{}).each do |key, opts|
             if opts[:jobs]
               jobs << opts[:jobs]
             end
@@ -70,7 +70,7 @@ module Mystro
       def schedule
         @schedule ||= begin
           s = {}
-          @plugins.each do |key, opts|
+          (@plugins||{}).each do |key, opts|
             if opts[:schedule]
               opts[:schedule].each do |w, o|
                 n = w.to_s.capitalize + "Worker"

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"                # talk to cloud
-  gem.add_dependency "yell", "~> 1.2.0"   # logging
-  gem.add_dependency "hashie"             # better data objects
-  gem.add_dependency "activesupport"      # 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.8" # 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.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: yell
   requirement: !ruby/object:Gem::Requirement
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.8
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -149,15 +151,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 187241732432355941
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 187241732432355941
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: common functionality for Mystro