eac_launcher 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e37ffc318f78eed70edcee0ed1ebca08bd89b2bd
-  data.tar.gz: 5d74edb3dcaa1aea513d07dc4e2e2fa31c32ec76
+  metadata.gz: 380d1f61d80e539cc654af9001183f3de43c5456
+  data.tar.gz: 12c85fabb456c5aeb4544a374cefbc469dc6c916
 SHA512:
-  metadata.gz: 6b315365e92517c172dcd3072f26253908ae2b9103963e7d74caf1be4e3ee37ac62953c3c1ee79a9bf0c29626fef233cd784a760e96ceca1d317489ca276b13f
-  data.tar.gz: b5c31a49522e094d1c23ba613e4eb10d840b30a8e02815413bb565b1542af95ea9743ee43f724ba4919a1838704622123b40f42bb0e7bfcbbcf17ba5957ee226
+  metadata.gz: 4949dcf967347ccb56f4f50f3185bf35911bbe70c96592134d9894bffac708ea53454e6a416ac6387e1afd07b34b27e58f8a4519508a3f84362e63c59cc2949a
+  data.tar.gz: 3742a103c667b7fb5cc7e38047420eacf91261decb58ca798a03a9dde37a64d5ab1e948281c198d030a4e82ae239af2adc438fc0fdc07c200fab2c08723f40cd

data/lib/eac_launcher.rb

@@ -23,10 +23,13 @@ module EacLauncher
   require 'eac_launcher/git/publish_base'
   require 'eac_launcher/git/warp_base'
   require 'eac_launcher/instances/base'
+  require 'eac_launcher/instances/error'
   require 'eac_launcher/instances/runner_helper'
   require 'eac_launcher/instances/settings'
   require 'eac_launcher/publish/base'
   require 'eac_launcher/publish/check_result'
+  require 'eac_launcher/ruby/gem/build'
+  require 'eac_launcher/ruby/gem/specification'
   require 'eac_launcher/stereotypes/git'
   require 'eac_launcher/stereotypes/git_subrepo'
   require 'eac_launcher/stereotypes/git_subtree'

data/lib/eac_launcher/git/publish_base.rb

@@ -10,7 +10,9 @@ module EacLauncher
         @instance = instance
       end
 
-      def check
+      protected
+
+      def internal_check
         if publish_remote_no_exist?
           ::EacLauncher::Publish::CheckResult.blocked('Remote does not exist')
         elsif remote_equal_or_following?

data/lib/eac_launcher/instances/base.rb

@@ -63,8 +63,8 @@ module EacLauncher
         stereotypes.each do |s|
           return s.warp_class.new(self) if s.warp_class
         end
-        raise "None stereotype of \"#{to_root_path}\" has subclass \"CurrentCache\" " \
-          "(#{stereotypes.join(', ')})"
+        raise ::EacLauncher::Instances::Error, "None stereotype of \"#{to_root_path}\" has " \
+          "subclass \"CurrentCache\" (#{stereotypes.join(', ')})"
       end
 
       private

data/lib/eac_launcher/instances/error.rb

@@ -0,0 +1,6 @@
+module EacLauncher
+  module Instances
+    class Error < StandardError
+    end
+  end
+end

data/lib/eac_launcher/path.rb

@@ -11,7 +11,7 @@ module EacLauncher
     def find_file_with_extension(extension)
       r = find_files_with_extension(extension)
       return r.first if r.any?
-      raise "Extension \"#{extension}\" not found in directory \"#{directory}\""
+      raise "Extension \"#{extension}\" not found in directory \"#{self}\""
     end
 
     def find_files_with_extension(extension)

data/lib/eac_launcher/publish/base.rb

@@ -7,6 +7,12 @@ module EacLauncher
         return unless s.status == ::EacLauncher::Publish::CheckResult::STATUS_PENDING
         publish
       end
+
+      def check
+        internal_check
+      rescue ::EacLauncher::Instances::Error => ex
+        ::EacLauncher::Publish::CheckResult.blocked("Error: #{ex}")
+      end
     end
   end
 end

data/lib/eac_launcher/ruby/gem/build.rb

@@ -0,0 +1,75 @@
+module EacLauncher
+  module Ruby
+    module Gem
+      class Build
+        include ::EacRubyUtils::Console::Speaker
+
+        def initialize(original_gem_root)
+          @original_gem_root = original_gem_root
+        end
+
+        def output_file
+          return nil unless @gem_root
+          @gem_root.find_files_with_extension('.gem').first
+        end
+
+        def builded?
+          output_file.present? && ::File.exist?(output_file)
+        end
+
+        def build
+          return if builded?
+          copy_gem_files
+          build_gem
+          check_gem
+        end
+
+        def close
+          ::FileUtils.remove_entry(@gem_root) if ::File.directory?(@gem_root)
+          @gem_root = nil
+        end
+
+        private
+
+        def copy_gem_files
+          @gem_root = ::EacLauncher::Path.new(::Dir.mktmpdir)
+          FileUtils.cp_r "#{@original_gem_root}/.", @gem_root
+        end
+
+        def build_gem
+          info("Building gemspec #{gemspec_file}...")
+          clear_gems
+          Dir.chdir @gem_root do
+            EacRubyUtils::Envs.local.command('gem', 'build', gemspec_file).execute!
+          end
+        end
+
+        def check_gem
+          Dir.mktmpdir do |dir|
+            Dir.chdir dir do
+              EacRubyUtils::Envs.local.command('gem', 'unpack', gem).system
+              gs = File.join(dir, File.basename(gem, '.gem'))
+              if (Dir.entries(gs) - %w[. ..]).empty?
+                raise "\"#{dir}\" (Unpacked from #{gem}) has no source code"
+              end
+            end
+          end
+        end
+
+        def clear_gems
+          @gem_root.find_files_with_extension('.gem').each do |f|
+            FileUtils.rm_rf(f)
+          end
+        end
+
+        def gemspec_file
+          @gem_root.find_file_with_extension('.gemspec')
+        end
+
+        def gem
+          @gem_root.find_file_with_extension('.gem')
+        end
+      end
+    end
+  end
+end

data/lib/eac_launcher/ruby/gem/specification.rb

@@ -0,0 +1,47 @@
+module EacLauncher
+  module Ruby
+    module Gem
+      class Specification
+        class << self
+          def parse_version_file(file)
+            s = ::File.read(file)
+            m = /VERSION\s*=\s*[\'\"]([^\'\"]+)[\'\"]/.match(s)
+            m ? m[1] : nil
+          end
+        end
+
+        attr_reader :gemspec_file
+
+        def initialize(gemspec_file)
+          @gemspec_file = gemspec_file
+        end
+
+        def version
+          v = self.class.parse_version_file(version_file)
+          return v if v.present?
+          raise "Version not found on file \"#{version_file}\""
+        end
+
+        def name
+          ::File.basename(gemspec_file).gsub(/\.gemspec\z/, '')
+        end
+
+        def full_name
+          "#{name}-#{version}"
+        end
+
+        private
+
+        def gem_root
+          ::File.dirname(gemspec_file)
+        end
+
+        def version_file
+          f = ::File.join(gem_root, 'lib', name, 'version.rb')
+          return f if ::File.exist?(f)
+          raise "Version file \"#{f}\" does not exist"
+        end
+      end
+    end
+  end
+end

data/lib/eac_launcher/stereotypes/git_subrepo/warp.rb

@@ -20,9 +20,10 @@ module EacLauncher
         private
 
         def check_parent
-          return if parent_cache_git.descendant?('HEAD', subrepo_parent_hash)
-          raise "Subrepo parent hash \"#{subrepo_parent_hash}\" not found in " \
-            "\"#{parent_cache_git}\""
+          return if parent_cache_git.rev_parse(subrepo_parent_hash) &&
+                    parent_cache_git.descendant?('HEAD', subrepo_parent_hash)
+          raise EacLauncher::Instances::Error, "Subrepo parent hash \"#{subrepo_parent_hash}\""\
+            " not found in \"#{parent_cache_git}\""
         end
 
         def subrepo_parent_hash

data/lib/eac_launcher/stereotypes/ruby_gem.rb

@@ -12,8 +12,8 @@ module EacLauncher
           :red
         end
 
-        def load_gemspec(file)
-          ::Gem::Specification.load(file)
+        def load_gemspec(gemspec_file)
+          ::EacLauncher::Ruby::Gem::Specification.new(gemspec_file)
         end
       end
     end

data/lib/eac_launcher/stereotypes/ruby_gem/publish.rb

@@ -6,10 +6,12 @@ module EacLauncher
         include ::EacRubyUtils::Console::Speaker
 
         def initialize(instance)
-          @source = instance.current_cache
+          @instance = instance
         end
 
-        def check
+        protected
+
+        def internal_check
           if new_and_unpublishing_new?
             ::EacLauncher::Publish::CheckResult.blocked(
               "#{gem_spec.full_name} does not exist in RubyGems"
@@ -24,17 +26,23 @@ module EacLauncher
 
         private
 
+        def source_uncached
+          @instance.current_cache
+        end
+
         def gem_spec_uncached
           ::EacLauncher::Stereotypes::RubyGem.load_gemspec(gemspec)
         end
 
+        def gem_build_uncached
+          ::EacLauncher::Ruby::Gem::Build.new(source)
+        end
+
         def publish
-          Dir.mktmpdir do |dir|
-            @tempdir = ::EacLauncher::Path.new(dir)
-            build_gem
-            check_gem
-            push_gem
-          end
+          gem_build.open
+          push_gem
+        ensure
+          gem_build.close
         end
 
         def new_and_unpublishing_new?
@@ -46,7 +54,7 @@ module EacLauncher
         end
 
         def version_already_pushed?
-          gem_versions.any? { |v| v['number'] == gem_spec.version.version }
+          gem_versions.any? { |v| v['number'] == gem_spec.version }
         end
 
         def gem_versions_uncached
@@ -56,36 +64,6 @@ module EacLauncher
           raise "#{http} code error: #{http.status}"
         end
 
-        def build_gem
-          info("Building gem #{gem_spec}...")
-          clear_gems
-          Dir.chdir @source do
-            EacRubyUtils::Envs.local.command('gem', 'build', gemspec).system
-          end
-          source = @source.find_file_with_extension('.gem')
-          FileUtils.mv(source, File.join(@tempdir, File.basename(source)))
-        ensure
-          clear_gems
-        end
-
-        def clear_gems
-          @source.find_files_with_extension('.gem').each do |f|
-            FileUtils.rm_rf(f)
-          end
-        end
-
-        def check_gem
-          Dir.mktmpdir do |dir|
-            Dir.chdir dir do
-              EacRubyUtils::Envs.local.command('gem', 'unpack', gem).system
-              gs = File.join(dir, File.basename(gem, '.gem'))
-              if (Dir.entries(gs) - %w[. ..]).empty?
-                raise "\"#{dir}\" (Unpacked from #{gem}) has no source code"
-              end
-            end
-          end
-        end
-
         def push_gem
           info("Pushing gem #{gem_spec}...")
           if ::EacLauncher::Context.current.publish_options[:confirm]
@@ -97,11 +75,7 @@ module EacLauncher
         end
 
         def gemspec_uncached
-          @source.find_file_with_extension('.gemspec')
-        end
-
-        def gem
-          @tempdir.find_file_with_extension('.gem')
+          source.find_file_with_extension('.gemspec')
         end
       end
     end

data/lib/eac_launcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacLauncher
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_launcher
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -106,6 +106,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -145,12 +159,15 @@ files:
 - lib/eac_launcher/git/warp_base.rb
 - lib/eac_launcher/instances/base.rb
 - lib/eac_launcher/instances/base/cache.rb
+- lib/eac_launcher/instances/error.rb
 - lib/eac_launcher/instances/runner_helper.rb
 - lib/eac_launcher/instances/settings.rb
 - lib/eac_launcher/path.rb
 - lib/eac_launcher/project.rb
 - lib/eac_launcher/publish/base.rb
 - lib/eac_launcher/publish/check_result.rb
+- lib/eac_launcher/ruby/gem/build.rb
+- lib/eac_launcher/ruby/gem/specification.rb
 - lib/eac_launcher/stereotype.rb
 - lib/eac_launcher/stereotypes/git.rb
 - lib/eac_launcher/stereotypes/git/publish.rb