mystro-common 0.3.0 → 0.3.1.alpha2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjhlMjdhZjYyYmYxYjgxNzY4ZWYyZDRjOTE1ZDU5ODdkZWIyZTMxZQ==
+  data.tar.gz: !binary |-
+    OGRjM2YxYzU3OGE4NWE3NGNhYzUyYzRjZGYyN2EwOGQ3OTY0N2QwNg==
+SHA512:
+  metadata.gz: !binary |-
+    YjJkMzFiMzMxZGY5MzM2YzY5ZjQxM2IxMjAzMjRiMGE5ZDFhMGRjYTc1Nzcz
+    ZmFhZmY3MjczNWZmYTJkMTA3ZTg0ODEyOGY0Y2E5ZGExY2NkMmNkNjZmOTM0
+    NmI3OGEzYWU0MmUxMjhhMzJhNjVkN2Q0ODgxMTcyODVkOGQyODM=
+  data.tar.gz: !binary |-
+    MzA5ZTZkOGZhN2M5NGI5ZTVlOTYzN2ZjNmM2M2NhNDExNmY2NDAxMjIzN2I1
+    MDExNzdkZDUxNmMzNzkyMTNmZjE0NGFjNDRiZTc3YWQ4OWFkMzg2YmZlYjgx
+    Mjg4MjljNGJhNDgwM2Q0MTNiMDY4NGQxMGU0YjkxOTQzOGRmOWY=

data/.crackin.yml

@@ -0,0 +1,12 @@
+---
+crackin:
+  name: 'mystro-common'
+  scm: git
+  changelog: CHANGELOG.md
+  branch:
+    production: master
+    development: develop
+  version: lib/mystro/common/version.rb
+  build:
+    command: rake build
+    after: []

data/CHANGELOG.md

@@ -1,9 +1,21 @@
-# Changelog
+### Changelog
 
-## v0.3.0:
+##### v0.3.1.alpha2:
+* think I've resolved problem with crackin release
+
+##### v0.3.1.alpha1:
+* trouble with crackin release process
+
+##### v0.3.1.alpha0:
+* add name to crackin config
+* integrate crackin for gem releases
+* update to fog 1.18
+* fog issues resolved
+
+##### v0.3.0:
 * sync version with server
 
-## v0.2.0:
+##### v0.2.0:
 * tests green.
 * conversion work completed... still want to test things a bit
 * custom create method for balancers
@@ -36,19 +48,19 @@
 * providers support
 * orgs
 
-## v0.1.11:
+##### v0.1.11:
 * fixes bug if disabled is not set
 
-## v0.1.10:
+##### v0.1.10:
 * allow for disabling plugins
 
-## v0.1.9:
+##### v0.1.9:
 * fucking bug in dns code again
 
-## v0.1.8:
+##### v0.1.8:
 * revert new dsl creeping in when it wasnt supposed to
 
-## v0.1.7:
+##### v0.1.7:
 * fix lingering error with Account.list change
 * merge v0.1.6
 * merge release v0.1.2
@@ -56,7 +68,7 @@
 * ruby version file
 * changelog rake tasks
 
-## v0.1.6:
+##### v0.1.6:
 * update rails to 3.2.14. tweak plugins jobs output to match qujo. fix issue with getting zones through fog
 * smarter errors in dns connect. add and use Account#get instead of @list attr
 * merge
@@ -65,12 +77,15 @@
 * ruby version file
 * changelog rake tasks
 
-## v0.1.4:
+##### v0.1.5:
+
+
+##### v0.1.4:
 * merge
 * hard code rake version in Gemfile to match mystro server
 * support for templates in userdata, handled like files, but processed through erubis
 
-## v0.1.3:
+##### 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
@@ -80,13 +95,16 @@
 * ruby version file
 * changelog rake tasks
 
-## v0.1.2:
+##### v0.1.2:
 * new plugin support code for mystro-volley integration
 * new DSL framework
 * ruby version file
 * changelog rake tasks
 
-## v0.1.1:
+##### v0.1.1:
 * new DSL framework
 * ruby version file
 
+##### v0.1.0:
+
+

data/Gemfile

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

data/lib/fog/ext/dynect/models/dns/records.rb

@@ -1,62 +1,7 @@
-require 'fog/core/collection'
-require 'fog/ext/dynect/models/dns/record'
-
 module Fog
   module DNS
     class Dynect
-
       class Records < Fog::Collection
-
-        attribute :zone
-
-        model Fog::DNS::Dynect::Record
-
-        def all(options = {})
-          requires :zone
-          data = []
-          service.get_all_records(zone.domain, options).body['data'].each do |url|
-            (_, _, t, _, fqdn, id) = url.split('/')
-            type = t.gsub(/Record$/, '')
-
-            # leave out the default, read only records
-            # by putting this here we don't make the secondary request for these records
-            next if ['NS', 'SOA'].include?(type)
-            record = service.get_record(type, zone.domain, fqdn, 'record_id' => id).body['data']
-
-            data << {
-              :identity => record['record_id'],
-              :fqdn => record['fqdn'],
-              :type => record['record_type'],
-              :rdata => record['rdata']
-            }
-          end
-
-          load(data)
-        end
-
-        def get(record_id)
-          requires :zone
-
-          list = service.get_all_records(zone.domain, {}).body['data']
-          url = list.detect { |e| e =~ /\/#{record_id}$/ }
-          return unless url
-          (_, _, t, _, fqdn, id) = url.split('/')
-          type = t.gsub(/Record$/, '')
-          record = service.get_record(type, zone.domain, fqdn, 'record_id' => id).body['data']
-
-          new({
-            :identity => record['record_id'],
-            :fqdn => record['fqdn'],
-            :type => record['record_type'],
-            :rdata => record['rdata']
-          })
-        end
-
-        def new(attributes = {})
-          requires :zone
-          super({:zone => zone}.merge!(attributes))
-        end
-
         def find_by_name(name)
           requires :zone
           data = []
@@ -79,9 +24,7 @@ module Fog
 
           load(data)
         end
-
       end
-
     end
   end
 end

data/lib/mystro/cloud/connect/dynect/record.rb

@@ -1,5 +1,4 @@
 require 'ipaddress'
-#require 'ext/fog/dynect/models/dns/records'
 
 module Mystro
   module Cloud

data/lib/mystro/cloud/connect/dynect.rb

@@ -1,5 +1,5 @@
 require 'mystro/cloud/connect/fog'
-require 'fog/ext/dynect'
+require 'fog/ext/dynect/models/dns/records'
 
 module Mystro
   module Cloud

data/lib/mystro/common/version.rb

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

data/mystro-common.gemspec

@@ -4,24 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mystro/common/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "mystro-common"
+  gem.name          = 'mystro-common'
   gem.version       = Mystro::Common::Version::STRING
-  gem.authors       = ["Shawn Catanzarite"]
-  gem.email         = ["me@shawncatz.com"]
+  gem.authors       = ['Shawn Catanzarite']
+  gem.email         = ['me@shawncatz.com']
   gem.description   = %q{common functionality for Mystro}
   gem.summary       = %q{common functionality for Mystro}
-  gem.homepage      = "http://github.com/mystro"
+  gem.homepage      = 'http://github.com/mystro'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.add_dependency "fog", "~> 1.15.0"        # 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
-  gem.add_dependency "damsel", "~> 0.1.0"      # dsl
+  gem.add_dependency 'fog', '~> 1.18.0'        # talk to cloud
+  gem.add_dependency 'unf'
+  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
+  gem.add_dependency 'damsel', '~> 0.1.0'      # dsl
 end

data/spec/support/record.rb

@@ -9,29 +9,49 @@ shared_examples "cloud record" do
     model
   end
 
-  context "find", :find do
-    let(:id) { config[:id] }
-    let(:name) { config[:name] }
-    let(:model) { cloud.find(id) }
-
-    subject { model }
-    it { should be_instance_of(Mystro::Cloud::Record) }
-    its(:id) { should == id }
-    its(:name) { should == name }
+  context 'find', :find do
+    context 'by id' do
+      let(:id) { config[:id] }
+      let(:name) { config[:name] }
+      let(:found) { cloud.find(id) }
+
+      subject { found }
+      it { should be_instance_of(Mystro::Cloud::Record) }
+      its(:id) { should == id }
+      its(:name) { should == name }
+    end
+
+    context 'by name' do
+      let(:id) { config[:id] }
+      let(:name) { config[:name] }
+      let(:found) { cloud.find_by_name(name) }
+
+      subject { found }
+      it { should be_instance_of(Mystro::Cloud::Record) }
+      its(:id) { should == id }
+      its(:name) { should == name }
+    end
+
+    context 'doesnt exist' do
+      let(:id) { '123456789'}
+      it 'should handle missing' do
+        expect { cloud.find(id) }.to raise_error(Mystro::Cloud::NotFound)
+        #expect(found).to be(nil)
+      end
+    end
   end
 
-  context "all" do
+  context 'all', :all do
     let(:all) { cloud.all }
-    it "should return models" do
+    it 'should return models' do
       all.each do |i|
         expect(i).to be_instance_of(Mystro::Cloud::Record)
       end
     end
   end
 
-  context "create and destroy" do
-
-    it "should create and destroy" do
+  context 'create and destroy', :cad do
+    it 'should create and destroy' do
       n = cloud.create(model)
       expect(n).to be_instance_of(Mystro::Cloud::Record)
       expect(n.name).not_to be(nil)

metadata

@@ -1,36 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: mystro-common
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.1.alpha2
 platform: ruby
 authors:
 - Shawn Catanzarite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-11-22 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: 1.15.0
+        version: 1.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.18.0
+- !ruby/object:Gem::Dependency
+  name: unf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yell
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: damsel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -130,6 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .crackin.yml
 - .gitignore
 - .rspec
 - .ruby-version
@@ -139,22 +139,7 @@ files:
 - README.md
 - Rakefile
 - lib/fog/ext/balancer.rb
-- lib/fog/ext/dynect.rb
-- lib/fog/ext/dynect/dns.rb
-- lib/fog/ext/dynect/models/dns/record.rb
 - lib/fog/ext/dynect/models/dns/records.rb
-- lib/fog/ext/dynect/models/dns/zone.rb
-- lib/fog/ext/dynect/models/dns/zones.rb
-- lib/fog/ext/dynect/requests/dns/delete_record.rb
-- lib/fog/ext/dynect/requests/dns/delete_zone.rb
-- lib/fog/ext/dynect/requests/dns/get_all_records.rb
-- lib/fog/ext/dynect/requests/dns/get_node_list.rb
-- lib/fog/ext/dynect/requests/dns/get_record.rb
-- lib/fog/ext/dynect/requests/dns/get_zone.rb
-- lib/fog/ext/dynect/requests/dns/post_record.rb
-- lib/fog/ext/dynect/requests/dns/post_session.rb
-- lib/fog/ext/dynect/requests/dns/post_zone.rb
-- lib/fog/ext/dynect/requests/dns/put_zone.rb
 - lib/mystro-common.rb
 - lib/mystro/capistrano.rb
 - lib/mystro/cloud.rb
@@ -208,33 +193,26 @@ 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: -201190253362544138
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -201190253362544138
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: common functionality for Mystro
 test_files:
 - spec/cloud/aws/balancer_spec.rb

data/lib/fog/ext/dynect/dns.rb

@@ -1,140 +0,0 @@
-require 'fog/dynect'
-require 'fog/dns'
-
-module Fog
-  module DNS
-    class Dynect < Fog::Service
-
-      requires :dynect_customer, :dynect_username, :dynect_password
-      recognizes :timeout, :persistent
-      recognizes :provider # remove post deprecation
-
-      model_path 'fog/ext/dynect/models/dns'
-      model       :record
-      collection  :records
-      model       :zone
-      collection  :zones
-
-      request_path 'fog/ext/dynect/requests/dns'
-      request :delete_record
-      request :delete_zone
-      request :get_node_list
-      request :get_all_records
-      request :get_record
-      request :get_zone
-      request :post_record
-      request :post_session
-      request :post_zone
-      request :put_zone
-
-      class JobIncomplete < Error; end
-
-      class Mock
-        def initialize(options={})
-          @dynect_customer = options[:dynect_customer]
-          @dynect_username = options[:dynect_username]
-          @dynect_password = options[:dynect_password]
-        end
-
-        def self.data
-          @data ||= {
-            :zones => {}
-          }
-        end
-
-        def self.reset
-          @data = nil
-        end
-
-        def auth_token
-          @auth_token ||= Fog::Dynect::Mock.token
-        end
-
-        def data
-          self.class.data
-        end
-
-        def reset_data
-          self.class.reset
-        end
-      end
-
-      class Real
-        def initialize(options={})
-          @dynect_customer = options[:dynect_customer]
-          @dynect_username = options[:dynect_username]
-          @dynect_password = options[:dynect_password]
-
-          @connection_options = options[:connection_options] || {}
-          @host       = 'api-v4.dynect.net'
-          @port       = options[:port]        || 443
-          @path       = options[:path]        || '/REST'
-          @persistent = options[:persistent]  || false
-          @scheme     = options[:scheme]      || 'https'
-          @version    = options[:version]     || '3.5.2'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
-        end
-
-        def auth_token
-          @auth_token ||= post_session.body['data']['token']
-        end
-
-        def request(params)
-          begin
-            # any request could redirect to a job
-            params[:expects] = Array(params[:expects]) | [307]
-
-            params[:headers] ||= {}
-            params[:headers]['Content-Type'] = 'application/json'
-            params[:headers]['API-Version'] = @version
-            params[:headers]['Auth-Token'] = auth_token unless params[:path] == 'Session'
-            params[:path] = "#{@path}/#{params[:path]}" unless params[:path] =~ %r{^#{Regexp.escape(@path)}/}
-
-            response = @connection.request(params.merge!({:host => @host}))
-
-            if response.body.empty?
-              response.body = {}
-            elsif response.headers['Content-Type'] == 'application/json'
-              response.body = Fog::JSON.decode(response.body)
-            end
-
-            if response.body['status'] == 'failure'
-              raise Error, response.body['msgs'].first['INFO']
-            end
-
-            if response.status == 307 && params[:path] !~ %r{^/REST/Job/}
-              response = poll_job(response, params[:expects])
-            end
-
-            response
-          rescue Excon::Errors::HTTPStatusError => error
-            if @auth_token && error.message =~ /login: (Bad or expired credentials|inactivity logout)/
-              @auth_token = nil
-              retry
-            else
-              raise error
-            end
-          end
-
-          response
-        end
-
-        def poll_job(response, original_expects, time_to_wait = 10)
-          job_location = response.headers['Location']
-
-          Fog.wait_for(time_to_wait) do
-            response = request(:expects => original_expects, :method => :get, :path => job_location)
-            response.body['status'] != 'incomplete'
-          end
-
-          if response.body['status'] == 'incomplete'
-            raise JobIncomplete.new("Job #{response.body['job_id']} is still incomplete")
-          end
-
-          response
-        end
-      end
-
-    end
-  end
-end