miasma 0.2.34 → 0.2.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92b8d21e370e8219b46aee1a6bddae5d13c36256
-  data.tar.gz: 8041dc78826128dd9d3ca8e0ae29815b0059b093
+  metadata.gz: f76d5c922de15936a098e29670707f23ca81b498
+  data.tar.gz: e9cff2b8a5130c0133a10d82e1cf188f3987e2dc
 SHA512:
-  metadata.gz: 48b93716ce6f30272486cf38f9117cfcf0ce1f6e287b4beb552ecf4b9c86246260688a5f5045954a92a1a44e3879e296b3e0df464e878be55f4ee7fd9ab69fdf
-  data.tar.gz: 00d689e12cde2cea79fd86153094b2e09c8587c2d2bda34fe6eda60a9c2ce7f281f1bb82d99aad48669d283a6bcfec4ee0c6c12b2af653f435af93dcf5527a98
+  metadata.gz: 579a263c2aa3f4dd5231af2852fd401e3b872dbf117f737dfdebcf8808364640209e8515d8516b183a18a1ebd86558fa160865898717d3de42241aab9823753e
+  data.tar.gz: 982331e848c3a20c67e6e32cd6a5fb24923fab270db778c2e639b0c577bc502931bc0464c464de913f873d864eee7d7e9b85715a7b91eb74a4a3eef09f91b3ef

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.36
+* Refactor abstract model specs
+
 # v0.2.34
 * Remove deprecated method usage on http library
 

data/lib/miasma/models/load_balancer/balancer.rb

@@ -39,7 +39,7 @@ module Miasma
         end
 
         attribute :name, String
-        attribute :state, Symbol, :allowed_values => [:active, :pending]
+        attribute :state, Symbol, :allowed_values => [:active, :pending, :terminated]
         attribute :status, String
         attribute :servers, Server, :multiple => true, :coerce => lambda{|v| Server.new(v)}
         attribute :public_addresses, Address, :multiple => true, :coerce => lambda{|v| Address.new(v)}

data/lib/miasma/models/orchestration/resource.rb

@@ -16,6 +16,8 @@ module Miasma
           attribute :status_reason, String
           attribute :updated, Time, :coerce => lambda{|v| Time.parse(v.to_s)}
 
+          on_missing :reload
+
           attr_reader :stack
 
           def initialize(stack, args={})

data/lib/miasma/specs.rb

@@ -0,0 +1,12 @@
+Dir.glob(File.join(File.dirname(__FILE__), 'specs', '*.rb')).each do |s_file|
+  s_file_name = File.basename(s_file).sub('.rb', '')
+  require "miasma/specs/#{s_file_name}"
+end
+
+def miasma_spec_sleep(interval=20)
+  if(ENV['MIASMA_TEST_LIVE_REQUESTS'])
+    sleep(20)
+  else
+    sleep(0.1)
+  end
+end

data/lib/miasma/specs/compute_abstract.rb

@@ -0,0 +1,118 @@
+MIASMA_COMPUTE_ABSTRACT = ->{
+
+  # Required `let`s:
+  # * compute: compute API
+  # * build_args: server build arguments [Smash]
+
+  describe Miasma::Models::Compute, :vcr do
+
+    it 'should provide #servers collection' do
+      compute.servers.must_be_kind_of Miasma::Models::Compute::Servers
+    end
+
+    describe Miasma::Models::Compute::Servers do
+
+      it 'should provide instance class used within collection' do
+        compute.servers.model.must_equal Miasma::Models::Compute::Server
+      end
+
+      it 'should build new instance for collection' do
+        instance = compute.servers.build(:name => 'test')
+        instance.must_be_kind_of Miasma::Models::Compute::Server
+      end
+
+      it 'should provide #all servers' do
+        compute.servers.all.must_be_kind_of Array
+      end
+
+    end
+
+    describe Miasma::Models::Compute::Server do
+
+      before do
+        unless($miasma_instance)
+          VCR.use_cassette('Miasma_Models_Compute_Aws/GLOBAL_compute_instance_create') do
+            @instance = compute.servers.build(build_args)
+            @instance.save
+            until(@instance.state == :running)
+              miasma_spec_sleep
+              @instance.reload
+            end
+            $miasma_instance = @instance
+          end
+          Kernel.at_exit do
+            VCR.use_cassette('Miasma_Models_Compute_Aws/GLOBAL_compute_instance_destroy') do
+              $miasma_instance.destroy
+            end
+          end
+        else
+          @instance = $miasma_instance
+        end
+        @instance.reload
+      end
+
+      let(:instance){ @instance }
+
+      describe 'instance methods' do
+
+        it 'should have a name' do
+          instance.name.must_equal build_args[:name]
+        end
+
+        it 'should have an image_id' do
+          instance.image_id.must_equal build_args[:image_id]
+        end
+
+        it 'should have a flavor_id' do
+          instance.flavor_id.must_equal build_args[:flavor_id]
+        end
+
+        it 'should have an address' do
+          instance.addresses.detect do |addr|
+            addr.version == 4
+          end.address.must_match /^(\d+)+\.(\d+)\.(\d+)\.(\d+)$/
+        end
+
+        it 'should have a status' do
+          instance.status.wont_be_nil
+        end
+
+        it 'should be in :running state' do
+          instance.state.must_equal :running
+        end
+
+      end
+
+    end
+
+    describe 'instance lifecycle' do
+      it 'should create new server, reload details and destroy server' do
+        instance = compute.servers.build(build_args)
+        instance.save
+        instance.id.wont_be_nil
+        instance.state.must_equal :pending
+        compute.servers.reload.get(instance.id).wont_be_nil
+        until(instance.state == :running)
+          miasma_spec_sleep
+          instance.reload
+        end
+        instance.state.must_equal :running
+        instance.destroy
+        while(instance.state == :running)
+          miasma_spec_sleep
+          instance.reload
+        end
+        [:pending, :terminated].must_include instance.state
+        if(instance.state == :pending)
+          until(instance.state == :terminated)
+            miasma_spec_sleep
+            instance.reload
+          end
+          instance.state.must_equal :terminated
+        end
+      end
+
+    end
+
+  end
+}

data/lib/miasma/specs/load_balancer_abstract.rb

@@ -0,0 +1,88 @@
+MIASMA_LOAD_BALANCER_ABSTRACT = ->{
+
+  # Required `let`s:
+  # * load_balancer: load balancer API
+  # * build_args: load balancer build arguments [Smash]
+
+  describe Miasma::Models::LoadBalancer, :vcr do
+
+    it 'should provide #balancers collection' do
+      load_balancer.balancers.must_be_kind_of Miasma::Models::LoadBalancer::Balancers
+    end
+
+    describe Miasma::Models::LoadBalancer::Balancers do
+
+      it 'should provide instance class used within collection' do
+        load_balancer.balancers.model.must_equal Miasma::Models::LoadBalancer::Balancer
+      end
+
+      it 'should build new instance for collection' do
+        instance = load_balancer.balancers.build
+        instance.must_be_kind_of Miasma::Models::LoadBalancer::Balancer
+      end
+
+      it 'should provide #all balancers' do
+        load_balancer.balancers.all.must_be_kind_of Array
+      end
+
+    end
+
+    describe Miasma::Models::LoadBalancer::Balancer do
+
+      before do
+        unless($miasma_balancer)
+          VCR.use_cassette('Miasma_Models_LoadBalancer_Aws/GLOBAL_load_balancer_create') do
+            @balancer = load_balancer.balancers.build(build_args)
+            @balancer.save
+            until(@balancer.state == :active)
+              miasma_spec_sleep
+              @balancer.reload
+            end
+            $miasma_balancer = @balancer
+          end
+          Kernel.at_exit do
+            VCR.use_cassette('Miasma_Models_LoadBalancer_Aws/GLOBAL_load_balancer_destroy') do
+              $miasma_balancer.destroy
+            end
+          end
+        else
+          @balancer = $miasma_balancer
+        end
+        @balancer.reload
+      end
+
+      let(:balancer){ @balancer }
+
+      describe 'collection' do
+
+        it 'should include balancer' do
+          load_balancer.balancers.reload.get(balancer.id).wont_be_nil
+        end
+
+      end
+
+      describe 'balancer methods' do
+
+        it 'should have a name' do
+          balancer.name.must_equal build_args[:name]
+        end
+
+        it 'should be in :active state' do
+          balancer.state.must_equal :active
+        end
+
+        it 'should have a status' do
+          balancer.status.wont_be_nil
+          balancer.status.must_be_kind_of String
+        end
+
+        it 'should have a public address' do
+          balancer.public_addresses.wont_be :empty?
+        end
+
+      end
+
+    end
+
+  end
+}

data/lib/miasma/specs/orchestration_abstract.rb

@@ -0,0 +1,121 @@
+MIASMA_ORCHESTRATION_ABSTRACT = ->{
+
+  # Required `let`s:
+  # * orchestration: orchestration API
+  # * build_args: stack build arguments [Smash]
+
+  describe Miasma::Models::Orchestration, :vcr do
+
+    it 'should provide #stacks collection' do
+      orchestration.stacks.must_be_kind_of Miasma::Models::Orchestration::Stacks
+    end
+
+    describe Miasma::Models::Orchestration::Stacks do
+
+      it 'should provide instance class used within collection' do
+        orchestration.stacks.model.must_equal Miasma::Models::Orchestration::Stack
+      end
+
+      it 'should build new instance for collection' do
+        instance = orchestration.stacks.build
+        instance.must_be_kind_of Miasma::Models::Orchestration::Stack
+      end
+
+      it 'should provide #all stacks' do
+        orchestration.stacks.all.must_be_kind_of Array
+      end
+
+    end
+
+    describe Miasma::Models::Orchestration::Stacks do
+
+      before do
+        unless($miasma_stack)
+          VCR.use_cassette('Miasma_Models_Orchestration_Aws/GLOBAL_orchestration_stack_create') do
+            @stack = orchestration.stacks.build(build_args)
+            @stack.save
+            until(@stack.state == :create_complete)
+              miasma_spec_sleep
+              @stack.reload
+            end
+            @stack.template
+            orchestration.stacks.reload
+            $miasma_stack = @stack
+          end
+          Kernel.at_exit do
+            VCR.use_cassette('Miasma_Models_Compute_Aws/GLOBAL_orchestration_stack_destroy') do
+              $miasma_stack.destroy
+            end
+          end
+        else
+          @stack = $miasma_stack
+        end
+        @stack.reload
+      end
+
+      let(:stack){ @stack }
+
+      describe 'collection' do
+
+        it 'should include stack' do
+          orchestration.stacks.all.detect{|s| s.id == stack.id}.wont_be_nil
+          orchestration.stacks.get(stack.id).wont_be_nil
+        end
+
+      end
+
+      describe 'instance methods' do
+
+        it 'should have a name' do
+          stack.name.must_equal build_args[:name]
+        end
+
+        it 'should be in :create_complete state' do
+          stack.state.must_equal :create_complete
+        end
+
+        it 'should have a status' do
+          stack.status.must_be_kind_of String
+        end
+
+        it 'should have a creation time' do
+          stack.created.must_be_kind_of Time
+        end
+
+        it 'should have parameters used for creation' do
+          stack.parameters.to_smash.must_equal build_args[:parameters].to_smash
+        end
+
+        it 'should include the templated used for creation' do
+          stack.template.to_smash.must_equal build_args[:template].to_smash
+        end
+
+      end
+
+    end
+
+    describe 'instance lifecycle' do
+      it 'should create new stack, reload details and destroy stack' do
+        stack = orchestration.stacks.build(build_args.merge(:name => 'miasma-test-stack-2'))
+        stack.save
+        stack.id.wont_be_nil
+        stack.state.must_equal :create_in_progress
+        orchestration.stacks.reload.get(stack.id).wont_be_nil
+        until(stack.state == :create_complete)
+          miasma_spec_sleep
+          stack.reload
+        end
+        stack.state.must_equal :create_complete
+        stack.destroy
+        [:delete_in_progress, :delete_complete].must_include stack.state
+        until(stack.state == :delete_complete)
+          miasma_spec_sleep
+          stack.reload
+        end
+        stack.state.must_equal :delete_complete
+      end
+
+    end
+
+  end
+}

data/lib/miasma/specs/storage_abstract.rb

@@ -0,0 +1,113 @@
+require 'open-uri'
+
+MIASMA_STORAGE_ABSTRACT = ->{
+
+  # Required `let`s:
+  # * storage: storage API
+
+  describe Miasma::Models::Storage, :vcr do
+
+    it 'should provide #buckets collection' do
+      storage.buckets.must_be_kind_of Miasma::Models::Storage::Buckets
+    end
+
+    describe Miasma::Models::Storage::Buckets do
+
+      it 'should provide instance class used within collection' do
+        storage.buckets.model.must_equal Miasma::Models::Storage::Bucket
+      end
+
+      it 'should build new instance for collection' do
+        storage.buckets.build.must_be_kind_of Miasma::Models::Storage::Bucket
+      end
+
+      it 'should provide #all buckets' do
+        storage.buckets.all.must_be_kind_of Array
+      end
+
+    end
+
+    describe Miasma::Models::Storage::Bucket do
+
+      it 'should act like a bucket' do
+        bucket = storage.buckets.build(:name => 'miasma-test-bucket-010')
+        bucket.save
+        bucket.reload
+
+        # should include the bucket
+        storage.buckets.reload.get('miasma-test-bucket-010').wont_be_nil
+        # should have a name
+        bucket.name.must_equal 'miasma-test-bucket-010'
+        # should have a #files collection
+        bucket.files.must_be_kind_of Miasma::Models::Storage::Files
+        #should provide #all files
+        bucket.files.all.must_be_kind_of Array
+        # should include reference to containing bucket
+        bucket.files.bucket.must_equal bucket
+        # should build new instance for collection
+        bucket.files.build.must_be_kind_of Miasma::Models::Storage::File
+
+        file_content = 'blahblahblah'
+        file = bucket.files.build
+        file.name = 'miasma-test-file'
+        file.body = file_content
+        file.save
+        file.reload
+
+        # should have a name
+        file.name.must_equal 'miasma-test-file'
+        # should have a size
+        file.size.must_equal file_content.size
+        # should have an updated timestamp
+        file.updated.must_be_kind_of Time
+        # should create a valid url
+        open(file.url).read.must_equal file_content
+        # should have a body
+        file.body.must_respond_to :readpartial
+        file.body.readpartial(Miasma::Models::Storage::READ_BODY_CHUNK_SIZE).must_equal file_content
+        file.destroy
+
+        big_file_content = '*' * Miasma::Models::Storage::MAX_BODY_SIZE_FOR_STRINGIFY
+        big_file = bucket.files.build
+        big_file.name = 'miasma-test-file-big'
+        big_file.body = big_file_content
+        big_file.save
+        big_file.reload
+
+        # should be the correct size
+        big_file.size.must_equal big_file.size
+        # should provide streaming body
+        big_file.body.must_respond_to :readpartial
+        content = big_file.body.readpartial(big_file.size)
+        content.must_equal big_file_content
+        big_file.destroy
+
+        require 'tempfile'
+        local_io_file = Tempfile.new('miasma-storage-test')
+        big_io_content = '*' * (Miasma::Models::Storage::MAX_BODY_SIZE_FOR_STRINGIFY * 1.3)
+        local_io_file.write big_io_content
+        local_io_file.flush
+        local_io_file.rewind
+        remote_file = bucket.files.build
+        remote_file.name = 'miasma-test-io-object-010'
+        remote_file.body = local_io_file
+        remote_file.save
+        remote_file.reload
+
+        # should be the correct size
+        remote_file.size.must_equal local_io_file.size
+        # should provide streaming body
+        remote_file.body.must_respond_to :readpartial
+        content = ''
+        while(chunk = remote_file.body.readpartial(1024))
+          content << chunk
+        end
+        content.must_equal big_io_content
+        remote_file.destroy
+        bucket.destroy
+      end
+
+    end
+
+  end
+}

data/lib/miasma/version.rb

@@ -1,4 +1,4 @@
 module Miasma
   # current library version
-  VERSION = Gem::Version.new('0.2.34')
+  VERSION = Gem::Version.new('0.2.36')
 end

data/miasma.gemspec

@@ -19,11 +19,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'miasma-aws'
   s.add_runtime_dependency 'miasma-open-stack'
   s.add_runtime_dependency 'miasma-rackspace'
-  s.executables << 'miasma-test'
   # Include development dependencies for running tests
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'vcr'
-  s.add_development_dependency 'webmock'
   s.files = Dir['{bin,lib}/**/*'] + %w(miasma.gemspec README.md CHANGELOG.md LICENSE)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma
 version: !ruby/object:Gem::Version
-  version: 0.2.34
+  version: 0.2.36
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -148,59 +148,15 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Smoggy API
 email: code@chrisroberts.org
-executables:
-- miasma-test
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- bin/miasma-test
 - lib/miasma.rb
 - lib/miasma/error.rb
 - lib/miasma/models.rb
@@ -229,6 +185,11 @@ files:
 - lib/miasma/models/storage/buckets.rb
 - lib/miasma/models/storage/file.rb
 - lib/miasma/models/storage/files.rb
+- lib/miasma/specs.rb
+- lib/miasma/specs/compute_abstract.rb
+- lib/miasma/specs/load_balancer_abstract.rb
+- lib/miasma/specs/orchestration_abstract.rb
+- lib/miasma/specs/storage_abstract.rb
 - lib/miasma/types.rb
 - lib/miasma/types/api.rb
 - lib/miasma/types/collection.rb

data/bin/miasma-test

@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'vcr'
-require 'fileutils'
-require 'webmock/minitest'
-require 'minitest/autorun'
-
-require 'miasma'
-
-miasma_spec_dir = File.join(File.dirname(File.dirname(__FILE__)), 'test', 'specs')
-
-# Always load in generic model specs
-Dir.glob(File.join(miasma_spec_dir, 'models', '*.rb')).each do |path|
-  require File.expand_path(path)
-end
-
-library_spec_dir = File.join(Dir.pwd, 'test', 'specs')
-
-unless(File.directory?(library_spec_dir))
-  $stderr.puts "ERROR: Failed to locate expected spec directory! (#{library_spec_dir})"
-  exit -1
-end
-
-if(ARGV.empty?)
-  cassette_directory = File.join(library_spec_dir, 'cassettes')
-
-  Dir.glob(File.join(library_spec_dir, '**/**/*_spec.rb')).each do |path|
-    require File.expand_path(path)
-  end
-
-else
-  cassette_directory = File.join(library_spec_dir, 'cassettes')
-
-  ARGV.each do |path|
-    full_path = File.expand_path(path)
-    if(File.exists?(full_path))
-      require full_path
-    else
-      $stderr.puts "ERROR: Failed to locate specified path! (#{full_path})"
-      exit -1
-    end
-  end
-
-end
-
-FileUtils.mkdir_p(cassette_directory)
-
-VCR.configure do |c|
-  c.cassette_library_dir = cassette_directory
-  c.hook_into :webmock
-end