charyf 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f336e5499d3b8ba1c98487ff346af2546a372e0e
-  data.tar.gz: 45664cb770c6af8da8c91ee9f82637680041da9a
+  metadata.gz: 8cfa0cfb7f56db44ae90413b60cc7a4e52efbcb9
+  data.tar.gz: 66ab9d05c60b4b7fec8f7f0fd35fbf1f6ac6154e
 SHA512:
-  metadata.gz: e86ec3feae3fe2ec2c2b349346b7f0abcadbf7e88f67e6211e85a29c379a6edb467ab07822a7361876463c09addc4584a50d08188f182e212af653fd38543aef
-  data.tar.gz: d7432ab641ff21c4a490004ee7e6a26869b3aa25bedc0631b0a462ae78c292b982c1f3495c4aee46466bd6e72cd5795311c70a188cc5a0d660edb9f5cbbd2707
+  metadata.gz: 7678c7af6c8606b78880d4bbc44407eb2a16264ceb083b3f3da58be733862b73a6246b6a9a34e581874c675c4617a8513eb89b3a9fede55fe21fc78ea749b0a9
+  data.tar.gz: 124617de56346b73fa8b3285e707fd12cc9dedc858052ee5bd73ebf7fdc9d9a7563567d48066b73b3a6d109a06b68f750e4aba507831a2cbc4fc13fec6ae834b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    charyf (0.2.7)
+    charyf (0.2.8)
       charyf_sig (~> 1.1.2)
       colorize (~> 0.8)
       i18n (~> 0.9)

data/lib/charyf/utils/app_engine.rb

@@ -14,7 +14,8 @@ module Charyf
 
       require_relative 'generators/app/app_generator'
       require_relative 'generators/skill/skill_generator'
-      require_relative 'generators/intents/intents_generator'
+      require_relative 'generators/skill/hooks_generator'
+      require_relative 'generators/installers/installers_generator'
 
       run_generators_blocks(app)
       self

data/lib/charyf/utils/configuration.rb

@@ -2,11 +2,21 @@ module Charyf
   module Configuration
 
     class Generators #:nodoc:
-      attr_accessor :options
-      attr_reader :hidden_namespaces
+      attr_reader :hidden_namespaces, :installers, :skill_hooks
+
+      def options
+        dup = @options.dup
+        dup[:charyf] ||= {}
+        dup[:installers] = @installers
+        dup[:skill_hooks] = @skill_hooks
+
+        dup
+      end
 
       def initialize
         @hidden_namespaces = []
+        @installers = []
+        @skill_hooks = []
         @options = Hash.new { |h, k| h[k] = {} }
       end
 

data/lib/charyf/utils/generators.rb

@@ -9,14 +9,15 @@ module Charyf
   module Generators
     include Charyf::Command::Behavior
 
-    REMOVED_GENERATORS = %w(app cli_app intents)
+    REMOVED_GENERATORS = %w(app cli_app skill_hooks installers)
 
 
     DEFAULT_ALIASES = {}
 
     DEFAULT_OPTIONS = {
         charyf: {
-            intents: true
+          # Skill hooks: true => allows automatic call for all hooks when generating new skill
+          skill_hooks: true
         }
     }
 
@@ -95,6 +96,8 @@ module Charyf
         namespaces = public_namespaces
         namespaces.sort!
 
+        hidden_namespaces.each { |n| namespaces.delete(n.to_s) }
+
         groups = Hash.new { |h, k| h[k] = [] }
         namespaces.each do |namespace|
           base = namespace.split(":").first
@@ -105,8 +108,6 @@ module Charyf
         charyf.map! { |n| n.sub(/^charyf:/, "") }
         REMOVED_GENERATORS.map { |name| charyf.delete(name) }
 
-        hidden_namespaces.each { |n| groups.delete(n.to_s) }
-
         [[ "charyf", charyf ]] + groups.sort.to_a
       end
 

data/lib/charyf/utils/generators/app/app_generator.rb

@@ -180,6 +180,8 @@ module Charyf
 
         public_task :run_bundle
 
+        public_task :run_installers
+
         def run_after_bundle_callbacks
           @after_bundle_callbacks.each(&:call)
         end

data/lib/charyf/utils/generators/app_base.rb

@@ -255,6 +255,22 @@ module Charyf
         end
       end
 
+      def charyf_command(command)
+        say_status :run, "charyf #{command}"
+
+        _charyf_command = Gem.bin_path("charyf", "charyf")
+
+        require "bundler"
+        Bundler.with_clean_env do
+          full_command = %Q["#{Gem.ruby}" "#{_charyf_command}" #{command}]
+          if options[:quiet]
+            system(full_command, out: File::NULL)
+          else
+            system(full_command)
+          end
+        end
+      end
+
       def bundle_install?
         !(options[:skip_gemfile] || options[:skip_bundle] || options[:pretend])
       end
@@ -263,6 +279,10 @@ module Charyf
         bundle_command("install") if bundle_install?
       end
 
+      def run_installers
+        charyf_command("generate installers") if bundle_install?
+      end
+
       def empty_directory_with_keep_file(destination, config = {})
         empty_directory(destination, config)
         keep_file(destination)

data/lib/charyf/utils/generators/installers/installers_generator.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative '../app_base'
+require_relative '../named_base'
+
+require_relative '../../generators'
+
+require_relative '../../../support'
+
+module Charyf
+  module Generators
+    class InstallersGenerator < Base # :nodoc:
+
+      def info_msg
+        say_status behavior, "Running all hooked installers", :green
+        puts ''
+      end
+
+      def try
+        hooked_generators.each do |generator_name|
+          names = generator_name.to_s.split(":")
+          klass = Charyf::Generators.find_by_namespace(names.pop, names.any? && names.join(":"))
+
+          if klass
+            say_status behavior, generator_name, :green
+
+            invoke generator_name, [], options.merge(autorun: true), behavior: behavior
+          else
+            say_status behavior, "#{generator_name} generator not found", :red
+          end
+
+          puts ''
+        end
+      end
+
+      private
+
+      def hooked_generators
+        (Charyf::Generators.options[:installers] || []).compact.map(&:downcase)
+      end
+
+    end
+  end
+end

data/lib/charyf/utils/generators/skill/hooks_generator.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative '../app_base'
+require_relative '../named_base'
+
+require_relative '../../generators'
+
+require_relative '../../../support'
+
+module Charyf
+  module Generators
+    class SkillHooksGenerator < NamedBase # :nodoc:
+
+      def try
+        hooked_generators.each do |generator_name|
+          names = generator_name.to_s.split(":")
+          klass = Charyf::Generators.find_by_namespace(names.pop, names.any? && names.join(":"))
+
+          if klass
+            say_status behavior, generator_name, :green
+
+            invoke generator_name, [name], options, behavior: behavior
+          else
+            say_status behavior, "#{generator_name} generator not found", :red
+          end
+        end
+      end
+
+      private
+
+      def hooked_generators
+        (Charyf::Generators.options[:skill_hooks] || []).compact.map(&:downcase)
+      end
+
+    end
+  end
+end

data/lib/charyf/utils/generators/skill/skill_generator.rb

@@ -40,7 +40,7 @@ module Charyf
         empty_directory File.join('app/skills', skill_content_path, 'initializers')
       end
 
-      hook_for :intents
+      hook_for :skill_hooks
 
     end
   end

data/lib/charyf/version.rb

@@ -11,7 +11,7 @@ module Charyf
   module VERSION
     MAJOR = 0
     MINOR = 2
-    TINY  = 7
+    TINY  = 8
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charyf
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Richard Ludvigh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charyf_sig
@@ -231,8 +231,9 @@ files:
 - lib/charyf/utils/generators/app/templates/gitignore
 - lib/charyf/utils/generators/app_base.rb
 - lib/charyf/utils/generators/defaults.rb
-- lib/charyf/utils/generators/intents/intents_generator.rb
+- lib/charyf/utils/generators/installers/installers_generator.rb
 - lib/charyf/utils/generators/named_base.rb
+- lib/charyf/utils/generators/skill/hooks_generator.rb
 - lib/charyf/utils/generators/skill/skill_generator.rb
 - lib/charyf/utils/generators/skill/templates/controllers/skill_controller.rb.tt
 - lib/charyf/utils/generators/skill/templates/module.rb.tt

data/lib/charyf/utils/generators/intents/intents_generator.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../app_base'
-require_relative '../named_base'
-
-require_relative '../../generators'
-
-require_relative '../../../support'
-
-module Charyf
-  module Generators
-    class IntentsGenerator < NamedBase # :nodoc:
-
-      def try
-        intent_generators.each do |generator_name|
-          names = generator_name(generator_name).to_s.split(":")
-          klass = Charyf::Generators.find_by_namespace(names.pop, names.any? && names.join(":"))
-
-          if klass
-            say_status behavior, generator_name(generator_name), :green
-
-            invoke generator_name(generator_name), [name], options, behavior: behavior
-          else
-            say_status behavior, "#{generator_name(generator_name)} generator not found", :red
-          end
-        end
-      end
-
-      private
-
-      def intent_generators
-        (Charyf::Generators.options[:intents] || {}).keys.map(&:downcase)
-      end
-
-      def generator_name(intent_processor_name)
-        "#{intent_processor_name}:intent"
-      end
-
-    end
-  end
-end