capsulecd 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ff6c3f188e2a0119a08be46b207bcabcc00626e
-  data.tar.gz: 5a34e3b9147833e003349f61ec06d1aa74b1ba95
+  metadata.gz: 846c1711f0ae0a45b11b3be3a3475b4ec7435d26
+  data.tar.gz: 766b95a987357b57d02ac101e5333c72c1db1c57
 SHA512:
-  metadata.gz: f4dff53e8f98e6b79460650c37885892bf24030ab89f496c99bf443d66e6995915a9b1b24e9b9394fbd25f2ffa76073b788ed50809bd3b5f5e1d7267c8090aa9
-  data.tar.gz: e741369a67de85819e55ee990fc4b4cf71327c3369138d81ba168dd750218081fe6fd54f35fe298897e9fe8f958e7588a225bbbbf75b239be8245485e67252ed
+  metadata.gz: 78d44d3b319f7c3b6c67ed766836a0b4cc2679a1b85df54d0100052977255979fd9dbfde4c85799d4e2ec0e6674df9fef29b4cc871bc99e2ddc7f442d90a4129
+  data.tar.gz: 4d3fef2e36f78caa58f66134311eae35c8911ddbb1d850db1409c29d4faec4d4920d640a7f5dc7395d281fcb7eed41fe1218b9cfde36550e6e79eb463ed58a94

data/lib/capsulecd/base/configuration.rb

@@ -96,20 +96,20 @@ module CapsuleCD
 
 
     def populate_runner_overrides
-      @runner = :circleci unless ENV['CIRCLECI'].to_s.empty?
+      # @runner = :circleci unless ENV['CIRCLECI'].to_s.empty?
       populate_runner
     end
 
     def populate_runner
-      if (@runner == :circleci)
-        # parse the PR# from the environment variable, eg. https://github.com/AnalogJ/cookbook_analogj_test/pull/9
-        @runner_pull_request ||= File.basename(URI.parse(ENV['CI_PULL_REQUEST']).path).to_i # => baz
-        @runner_sha ||= ENV['CIRCLE_SHA1']
-        @runner_branch ||= ENV['CIRCLE_BRANCH']
-        @runner_clone_url ||= 'https://github.com/' + ENV['CIRCLE_PROJECT_USERNAME'] + '/' + ENV['CIRCLE_PROJECT_REPONAME'] + '.git'
-        @runner_repo_name ||= ENV['CIRCLE_PROJECT_REPONAME']
-        @runner_repo_full_name ||= ENV['CIRCLE_PROJECT_USERNAME'] + '/' + ENV['CIRCLE_PROJECT_REPONAME']
-      end
+      # if (@runner == :circleci)
+      #   # parse the PR# from the environment variable, eg. https://github.com/AnalogJ/cookbook_analogj_test/pull/9
+      #   @runner_pull_request ||= File.basename(URI.parse(ENV['CI_PULL_REQUEST']).path).to_i # => baz
+      #   @runner_sha ||= ENV['CIRCLE_SHA1']
+      #   @runner_branch ||= ENV['CIRCLE_BRANCH']
+      #   @runner_clone_url ||= 'https://github.com/' + ENV['CIRCLE_PROJECT_USERNAME'] + '/' + ENV['CIRCLE_PROJECT_REPONAME'] + '.git'
+      #   @runner_repo_name ||= ENV['CIRCLE_PROJECT_REPONAME']
+      #   @runner_repo_full_name ||= ENV['CIRCLE_PROJECT_USERNAME'] + '/' + ENV['CIRCLE_PROJECT_REPONAME']
+      # end
     end
 
     def populate_env_overrides

data/lib/capsulecd/base/engine.rb

@@ -14,12 +14,12 @@ module CapsuleCD
         fail CapsuleCD::Error::SourceUnspecifiedError, 'No source defined.'
       end
 
-      if @config.runner == :circleci
-        require_relative 'runner/circleci'
-        self.class.send(:include, CapsuleCD::Runner::Circleci)
-      else
+      # if @config.runner == :circleci
+      #   require_relative 'runner/circleci'
+      #   self.class.send(:include, CapsuleCD::Runner::Circleci)
+      # else
         self.class.send(:include, CapsuleCD::Runner::Default)
-      end
+      # end
     end
 
     def start

data/lib/capsulecd/base/runner/circleci.rb

@@ -2,36 +2,36 @@ require 'uri'
 module CapsuleCD
   module Runner
     module Circleci
-      def runner_retrieve_payload(_options)
-        puts 'circleci runner_retrieve_payload'
-
-        # circleci only works with github, no need to parse @options[:source]
-        # here are the environmental variables we need to handle:
-        # https://circleci.com/docs/environment-variables
-
-        if @config.runner_pull_request.to_s.empty?
-          puts 'This is not a pull request. No automatic continuous deployment processing required. Continuous Integration testing will continue.'
-          @runner_is_pullrequest = false
-          # make this as similar to the pull request payload as possible.
-          payload = {
-            'head' => {
-              'sha' => @config.runner_sha,
-              'ref' => @config.runner_branch,
-              'repo' => {
-                'clone_url' => @config.runner_clone_url,
-                'name' => @config.runner_repo_name,
-                'full_name' => @config.runner_repo_full_name
-              }
-            }
-          }
-
-          payload
-        else
-          @runner_is_pullrequest = true
-          pull_request_number =  @config.runner_pull_request.to_i
-          @source_client.pull_request(@config.runner_repo_full_name, pull_request_number)
-        end
-      end
+      # def runner_retrieve_payload(_options)
+      #   puts 'circleci runner_retrieve_payload'
+      #
+      #   # circleci only works with github, no need to parse @options[:source]
+      #   # here are the environmental variables we need to handle:
+      #   # https://circleci.com/docs/environment-variables
+      #
+      #   if @config.runner_pull_request.to_s.empty?
+      #     puts 'This is not a pull request. No automatic continuous deployment processing required. Continuous Integration testing will continue.'
+      #     @runner_is_pullrequest = false
+      #     # make this as similar to the pull request payload as possible.
+      #     payload = {
+      #       'head' => {
+      #         'sha' => @config.runner_sha,
+      #         'ref' => @config.runner_branch,
+      #         'repo' => {
+      #           'clone_url' => @config.runner_clone_url,
+      #           'name' => @config.runner_repo_name,
+      #           'full_name' => @config.runner_repo_full_name
+      #         }
+      #       }
+      #     }
+      #
+      #     payload
+      #   else
+      #     @runner_is_pullrequest = true
+      #     pull_request_number =  @config.runner_pull_request.to_i
+      #     @source_client.pull_request(@config.runner_repo_full_name, pull_request_number)
+      #   end
+      # end
     end
   end
 end

data/lib/capsulecd/error.rb

@@ -39,13 +39,5 @@ module CapsuleCD
     # Raised when an error occurs while uploading package.
     class ReleasePackageError < BaseError; end
 
-    # Gracefully handle any errors raised by CapsuleCD, and exit with a failure
-    # status code.
-    # @param [CapsuleCD::Error::BaseError] ex
-    def self.handle_exception(ex)
-      puts ex.message
-      # Configuration.output.puts_red(ex.message)
-      exit false
-    end
   end
 end

data/lib/capsulecd/ruby/ruby_engine.rb

@@ -11,10 +11,10 @@ module CapsuleCD
         super
         gemspec_path = CapsuleCD::Ruby::RubyHelper.get_gemspec_path(@source_git_local_path)
 
-        # check for/create required VERSION file
-        gemspec_data = CapsuleCD::Ruby::RubyHelper.load_gemspec_data(gemspec_path)
+        # check for required VERSION file
+        gemspec_data = CapsuleCD::Ruby::RubyHelper.get_gemspec_data(@source_git_local_path)
 
-        if !gemspec_data || !File.exist?(CapsuleCD::Ruby::RubyHelper.version_filepath(@source_git_local_path, gemspec_data.name))
+        if !File.exist?(CapsuleCD::Ruby::RubyHelper.version_filepath(@source_git_local_path, gemspec_data.name))
           fail CapsuleCD::Error::BuildPackageInvalid, 'version.rb file is required to process Ruby gem'
         end
 
@@ -68,6 +68,9 @@ module CapsuleCD
           unless external.value.success?
             fail CapsuleCD::Error::BuildPackageFailed, 'gem build failed. Check gemspec file and dependencies'
           end
+          unless File.exist?(@source_git_local_path + "/#{gemspec_data.name}-#{next_version.to_s}.gem")
+            fail CapsuleCD::Error::BuildPackageFailed, "gem build failed. #{gemspec_data.name}-#{next_version.to_s}.gem not found"
+          end
         end
       end
 

data/lib/capsulecd/ruby/ruby_helper.rb

@@ -27,6 +27,9 @@ module CapsuleCD
         self.load_gemspec_data(self.get_gemspec_path(repo_path))
       end
 
+      ##################################################################################################################
+      # protected/private methods.
+
       # since the Gem::Specification class is basically eval'ing the gemspec file, and the gemspec file is doing a require
       # to load the version.rb file, the version.rb file is cached in memory. We're going to try to get around that issue
       # by parsing the gemspec file in a forked process.
@@ -49,9 +52,13 @@ module CapsuleCD
       end
 
       def self.load_gemspec_data(gemspec_path)
-        return self.execute_in_child do
+        gemspec_data = self.execute_in_child do
           Gem::Specification::load(gemspec_path)
         end
+        if !gemspec_data
+          fail CapsuleCD::Error::BuildPackageInvalid, '*.gemspec could not be parsed.'
+        end
+        return gemspec_data
       end
 
 

data/lib/capsulecd/version.rb

@@ -1,3 +1,3 @@
 module CapsuleCD
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/lib/capsulecd/chef/chef_engine_spec.rb

@@ -58,6 +58,22 @@ describe 'CapsuleCD::Chef::ChefEngine', :chef do
     end
   end
 
+  describe '#release_step' do
+    let(:engine) do
+      require 'capsulecd/chef/chef_engine'
+      CapsuleCD::Chef::ChefEngine.new(source: :github,
+                                      package_type: :chef)
+    end
+    let(:config_double) { CapsuleCD::Configuration.new }
+    describe 'when no chef_supermarket_username or chef_supermarket_key provided' do
+      it 'should raise an error' do
+        engine.instance_variable_set(:@config, config_double)
+
+        expect{engine.release_step}.to raise_error(CapsuleCD::Error::ReleaseCredentialsMissing)
+      end
+    end
+  end
+
   describe 'integration tests' do
     let(:engine) do
       require 'capsulecd/chef/chef_engine'

data/spec/lib/capsulecd/node/node_engine_spec.rb

@@ -57,6 +57,23 @@ describe 'CapsuleCD::Node::NodeEngine', :node do
     end
   end
 
+  describe '#release_step' do
+    let(:engine) do
+      require 'capsulecd/node/node_engine'
+      CapsuleCD::Node::NodeEngine.new(source: :github,
+                                      package_type: :node)
+    end
+    let(:config_double) { CapsuleCD::Configuration.new }
+    describe 'when no npm_auth_token provided' do
+      it 'should raise an error' do
+        engine.instance_variable_set(:@config, config_double)
+
+        expect{engine.release_step}.to raise_error(CapsuleCD::Error::ReleaseCredentialsMissing)
+
+      end
+    end
+  end
+
   describe 'integration tests' do
     let(:engine) do
       require 'capsulecd/node/node_engine'

data/spec/lib/capsulecd/python/python_engine_spec.rb

@@ -63,6 +63,23 @@ describe 'CapsuleCD::Python::PythonEngine', :python do
     end
   end
 
+  describe '#release_step' do
+    let(:engine) do
+      require 'capsulecd/python/python_engine'
+      CapsuleCD::Python::PythonEngine.new(source: :github,
+                                          package_type: :python)
+    end
+    let(:config_double) { CapsuleCD::Configuration.new }
+    describe 'when no pypi_username or no pypi_password provided' do
+      it 'should raise an error' do
+        engine.instance_variable_set(:@config, config_double)
+
+        expect{engine.release_step}.to raise_error(CapsuleCD::Error::ReleaseCredentialsMissing)
+
+      end
+    end
+  end
+
   describe 'integration tests' do
     let(:engine) do
       require 'capsulecd/python/python_engine'

data/spec/lib/capsulecd/ruby/ruby_engine_spec.rb

@@ -72,6 +72,22 @@ describe 'CapsuleCD::Ruby::RubyEngine', :ruby do
     end
   end
 
+  describe '#release_step' do
+    let(:engine) do
+      require 'capsulecd/ruby/ruby_engine'
+      CapsuleCD::Ruby::RubyEngine.new(source: :github,
+                                      package_type: :ruby)
+    end
+    let(:config_double) { CapsuleCD::Configuration.new }
+    describe 'when no rubygems_api_key provided' do
+      it 'should raise an error' do
+        engine.instance_variable_set(:@config, config_double)
+
+        expect{engine.release_step}.to raise_error(CapsuleCD::Error::ReleaseCredentialsMissing)
+      end
+    end
+  end
+
   describe 'integration tests' do
     let(:engine) do
       require 'capsulecd/ruby/ruby_engine'

data/spec/lib/capsulecd/ruby/ruby_helper_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe 'CapsuleCD::Ruby::RubyHelper', :ruby do
+  subject{
+    CapsuleCD::Ruby::RubyHelper
+  }
+  describe '#version_filepath' do
+    it 'default should generate the correct path to version.rb' do
+      expect(subject.version_filepath('/tmp','capsulecd')).to eql('/tmp/lib/capsulecd/version.rb')
+    end
+    it 'with custom version filename should generate the correct path' do
+      expect(subject.version_filepath('/tmp','capsulecd', 'VERSION.rb')).to eql('/tmp/lib/capsulecd/VERSION.rb')
+    end
+  end
+
+  describe '#get_gemspec_path' do
+    describe 'without a gemspec file' do
+      it 'should raise an error' do
+        expect{subject.get_gemspec_path(test_directory)}.to raise_error(CapsuleCD::Error::BuildPackageInvalid)
+      end
+    end
+
+    describe 'with a valid gemspec file' do
+      it 'should generate correct gemspec path' do
+        FileUtils.copy_entry('spec/fixtures/ruby/gem_analogj_test', test_directory)
+
+        expect(subject.get_gemspec_path(test_directory)).to eql(test_directory + '/gem_analogj_test.gemspec')
+      end
+    end
+  end
+
+  describe '#get_gemspec_data' do
+    it 'should parse gemspec data' do
+      FileUtils.copy_entry('spec/fixtures/ruby/gem_analogj_test', test_directory)
+      gemspec_data = subject.get_gemspec_data(test_directory)
+      expect(gemspec_data.name).to eql('gem_analogj_test')
+      expect(gemspec_data.version.to_s).to eql('0.1.3')
+    end
+
+    describe 'with an invalid gemspec file' do
+      it 'should raise an error' do
+        FileUtils.copy_entry('spec/fixtures/ruby/gem_analogj_test', test_directory)
+        FileUtils.rm(test_directory + '/lib/gem_analogj_test/version.rb')
+
+        expect{subject.get_gemspec_data(test_directory)}.to raise_error(CapsuleCD::Error::BuildPackageInvalid)
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capsulecd
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jason Kulatunga (AnalogJ)
@@ -187,6 +187,7 @@ files:
 - spec/lib/capsulecd/node/node_engine_spec.rb
 - spec/lib/capsulecd/python/python_engine_spec.rb
 - spec/lib/capsulecd/ruby/ruby_engine_spec.rb
+- spec/lib/capsulecd/ruby/ruby_helper_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_system.rb
 - spec/support/package_types.rb
@@ -276,6 +277,7 @@ test_files:
 - spec/lib/capsulecd/node/node_engine_spec.rb
 - spec/lib/capsulecd/python/python_engine_spec.rb
 - spec/lib/capsulecd/ruby/ruby_engine_spec.rb
+- spec/lib/capsulecd/ruby/ruby_helper_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_system.rb
 - spec/support/package_types.rb