avm-tools 0.63.0 → 0.64.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 855b0d8610e334378c5f061444ae6c414739fa383b9d09d64229ef8014feba53
-  data.tar.gz: '09008022bebd8de5a6c3104406c7b5f415f94b1c0f2d84700e92a2b29d4fa530'
+  metadata.gz: 1565797abcceccaa3a466abb16694b514ae9773b151142ad27628a0d344a6c2b
+  data.tar.gz: a2756806ed389c2d141a9d038cdb6a55aaa28c9747768cac97bb32ca27b49962
 SHA512:
-  metadata.gz: c4f2e3cb91702b6b93963c1478c38498c0774617538b75a8401ce96b00b505156aeb5d6554c595d5837c678a6f245b86352a57f86056c6599a40f5fbefae3cd7
-  data.tar.gz: a577468f0221af04fb6fc08a5f6ada465dc9e64228b4be577ac0b6cbdaed4cd995108ca0f88f713226cadacf4152b1243b18986f3d9212d20742b75a84e651ff
+  metadata.gz: 5d895b6ceef334e3b439291f2c2eed9477cc738864fede0f4426d0f7040768febf4759b3cc2267fa0ee34eb18301e8c0066e29b5c1a02b952fcacd7f711c91bd
+  data.tar.gz: 812e64910a913c855562bcea3f61aabf441cfafbd7a0af8e356dc217f66451f12361d30507343dbab2b56898313d319880d51bf59893ca11cab6c1d29ed90682

data/lib/avm/launcher/instances/base.rb

@@ -80,6 +80,7 @@ module Avm
 
         def publish?(stereotype)
           return false unless stereotype.publish_class
+          return false unless options.stereotype_publishable?(stereotype)
 
           filter = ::EacLauncher::Context.current.publish_options[:stereotype]
           filter.blank? ? true : filter == stereotype.name.demodulize

data/lib/avm/launcher/instances/settings.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avm
+  module Launcher
+    module Instances
+      class Settings
+        DEFAULT_CURRENT_REVISION = 'origin/master'
+        DEFAULT_PUBLISH_REMOTE = 'publish'
+        PUBLISHABLE_KEY = :publishable
+
+        common_constructor :data do
+          self.data = (data.is_a?(Hash) ? data : {}).with_indifferent_access
+        end
+
+        def git_current_revision
+          data[__method__] || DEFAULT_CURRENT_REVISION
+        end
+
+        def git_publish_remote
+          data[__method__] || DEFAULT_PUBLISH_REMOTE
+        end
+
+        def publishable?
+          !!publishable_value
+        end
+
+        def stereotype_publishable?(stereotype)
+          return publishable? unless publishable_value.is_a?(::Hash)
+
+          parse_publishable_value(publishable_value[stereotype.stereotype_name], true)
+        end
+
+        private
+
+        def publishable_value
+          parse_publishable_value(data[PUBLISHABLE_KEY], false)
+        end
+
+        def parse_publishable_value(value, hash_to_true)
+          return value.with_indifferent_access if !hash_to_true && value.is_a?(::Hash)
+          return true if value.nil? || value == true
+          return false if value == false
+
+          !!value
+        end
+      end
+    end
+  end
+end

data/lib/avm/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module Tools
-    VERSION = '0.63.0'
+    VERSION = '0.64.0'
   end
 end

data/lib/eac_launcher/context/settings.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
+require 'avm/launcher/instances/settings'
 require 'eac_ruby_utils/simple_cache'
 require 'yaml'
-require 'eac_launcher/instances/settings'
 
 module EacLauncher
   class Context
@@ -18,7 +18,7 @@ module EacLauncher
       end
 
       def instance_settings(instance)
-        ::EacLauncher::Instances::Settings.new(value(['Instances', instance.name]))
+        ::Avm::Launcher::Instances::Settings.new(value(['Instances', instance.name]))
       end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-tools
 version: !ruby/object:Gem::Version
-  version: 0.63.0
+  version: 0.64.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -373,6 +373,7 @@ files:
 - lib/avm/launcher/errors/non_project.rb
 - lib/avm/launcher/instances/base.rb
 - lib/avm/launcher/instances/base/cache.rb
+- lib/avm/launcher/instances/settings.rb
 - lib/avm/local_projects.rb
 - lib/avm/local_projects/instance.rb
 - lib/avm/local_projects/jobs/update.rb
@@ -516,7 +517,6 @@ files:
 - lib/eac_launcher/instances.rb
 - lib/eac_launcher/instances/error.rb
 - lib/eac_launcher/instances/runner_helper.rb
-- lib/eac_launcher/instances/settings.rb
 - lib/eac_launcher/paths.rb
 - lib/eac_launcher/paths/logical.rb
 - lib/eac_launcher/paths/real.rb

data/lib/eac_launcher/instances/settings.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module EacLauncher
-  module Instances
-    class Settings
-      def initialize(data)
-        @data = ActiveSupport::HashWithIndifferentAccess.new(data.is_a?(Hash) ? data : {})
-      end
-
-      def git_current_revision
-        @data[__method__] || 'origin/master'
-      end
-
-      def git_publish_remote
-        @data[__method__] || 'publish'
-      end
-
-      def publishable?
-        @data.key?(:publishable) ? @data[:publishable] : true
-      end
-    end
-  end
-end