appifier 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64a7a60db8dd229246c475055d13afb7bdfd5132ecc6ef459363e556d2e35fee
-  data.tar.gz: c0644082483f20413e04199e3be7a22d03b3555454014763d8fc08b09bf69049
+  metadata.gz: bc6decc46de1031b29f5752b5a8e9e19ff34503910f853a796c13becde17f516
+  data.tar.gz: 7cf6cff0288638c120c74f815087ea5e668a1299b1cde1407f0e42b46286057a
 SHA512:
-  metadata.gz: 4a84ad6c49d32cc7a5ab26ceac69e9727ca324696274223ca86653255a0c10deb72043d5f01d1f1313fd8599857a7b5fdb2cc87507ab2c6209cda20c8ec5082e
-  data.tar.gz: 56ad5218965225bcb9ad2caa95e241f9cdbe0063dbfd2631599ef915562a66463a3815a293987e72766735cbfaccaa9bba44febce253b514df8294caa6f766cb
+  metadata.gz: 1383dc7d00f324f6831066639eb4ae19577571ba6c3cf0eaa712fae13d41997ffa56ae10b90d74a9249c8fe8a18f29f1bc24b103f9a2bdaccb28934dc594ccd0
+  data.tar.gz: adb3a368020d53a60a880baba3f688b65e8b608224c1227e26acd9850d76753c85ddd64e77abe59635eed4f075369884eecadf29275ce8717866de29da36bb5d

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/appifier/actors/collector.rb

@@ -7,6 +7,7 @@ module Appifier
       
       extend Carioca::Injector
       inject service: :output
+      inject service: :finisher
       
       attr_accessor :dataset
       attr_reader :template
@@ -19,22 +20,25 @@ module Appifier
     
     
       def collect
-                
-        appifilename = "#{File.expand_path(Appifier::DEFAULT_TEMPLATES_PATH)}/#{template}/Appifile"
-        appifile = Appifier::Components::Appifile::new path: appifilename
-        prompt = TTY::Prompt.new
-        @dataset = {}
-        appifile.dataset_rules.each do |name, rule|
-          default = (rule[:default])? rule[:default] : ""
-          @dataset[name] = prompt.ask("Give #{rule[:description]} : ", default: default) do |q|
-            q.required true
-            q.validate Regexp.new(rule[:format]) if rule[:format]
-          end 
+        begin         
+          appifilename = "#{File.expand_path(Appifier::DEFAULT_TEMPLATES_PATH)}/#{template}/Appifile"
+          appifile = Appifier::Components::Appifile::new path: appifilename
+          prompt = TTY::Prompt.new
+          @dataset = {}
+          appifile.dataset_rules.each do |name, rule|
+            default = (rule[:default])? rule[:default] : ""
+            @dataset[name] = prompt.ask("Give #{rule[:description]} : ", default: default) do |q|
+              q.required true
+              q.validate Regexp.new(rule[:format]) if rule[:format]
+            end 
+          end
+          write_dataset template: @template, data: @dataset
+          @collected  = true
+          output.info "Dataset recorded for #{@template}" 
+        rescue TTY::Reader::InputInterrupt
+          output.warn "Interactive collect interrupted"
+          finisher.terminate exit_case: :interrupt
         end
-        write_dataset template: @template, data: @dataset
-        @collected  = true
-        output.info "Dataset recorded for #{@template}" 
-
       end 
       
       def collected? 

data/lib/appifier/actors/generator.rb

@@ -9,8 +9,9 @@ module Appifier
       inject service: :output
 
 
-      def initialize(src_root:, target_root:, dataset: )
-        @src_root = src_root
+      def initialize(template_root:, target_root:, dataset: )
+        @template_root = template_root
+        @src_root = "#{template_root}/skeleton"
         @target_root = target_root
         @target_folders = []
         @target_files = []
@@ -19,7 +20,7 @@ module Appifier
         @src_paths.delete_if { |file| file =~ %r{/\.$} }
         @src_folders = @src_paths.select { |item| File.directory? item }
         @src_files = @src_paths.select { |item| File.file? item }
-        raise 'Application template not found' unless File.exist?(src_root)
+        raise 'Application template not found' unless File.exist?(@template_root)
       end
 
       def generate(dry_run: false, force: false)
@@ -31,6 +32,7 @@ module Appifier
         generate_folders dry_run: dry_run
         output.info 'Generate files'
         generate_files dry_run: dry_run
+        copy_appifile dry_run: dry_run
       end
 
       def calculate
@@ -53,6 +55,15 @@ module Appifier
         end
       end
 
+
+      def copy_appifile(dry_run:)
+        output.info "Copy Appifile in #{@target_root} :"
+        action = dry_run ? :skipped : :ok
+        FileUtils.cp "#{@template_root}/Appifile", @target_root unless dry_run
+        output.send action, "Install Appifile"
+      end
+
+
       def generate_files(dry_run:)
         output.info "Target files to create in #{@target_root} :"
         @src_files.each_with_index do |path, index|

data/lib/appifier/cli/datasets.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+module Appifier
+  module CLI
+    module Subcommands
+      class Datasets < ::Thor
+
+        def initialize(*args)
+            super
+            @output = Carioca::Registry.get.get_service name: :output
+            @finisher = Carioca::Registry.get.get_service name: :finisher
+          end
+  
+          # Thor method : list availables datasets in user bundle
+          desc 'ls', 'list defined datasets in user bundle'
+          def ls
+            begin
+                Appifier::Components::Dataset::list
+                @finisher.terminate exit_case: :quiet_exit
+            rescue RuntimeError => e
+                @output.error e.message
+                @finisher.terminate exit_case: :error_exit
+            end 
+          end
+
+          # Thor method : show a specific dataset in user bundle
+          desc 'show DATASET', 'show a specific dataset in user bundle'
+          def show(dataset)
+            begin
+                Appifier::Components::Dataset::show dataset
+                @finisher.terminate exit_case: :quiet_exit
+            rescue RuntimeError => e
+                @output.error e.message
+                @finisher.terminate exit_case: :error_exit
+            end 
+          end
+
+          # Thor method : remove a dataset from user bundle
+          desc 'rm DATASET', 'Remove dataset from user bundle'
+          def rm(dataset)
+            begin 
+                Appifier::Components::Dataset::rm(dataset)
+                 @finisher.terminate exit_case: :quiet_exit
+            rescue RuntimeError => e
+                @output.error e.message
+                @finisher.terminate exit_case: :error_exit
+            end 
+         end
+
+
+          # Thor method : Prune orphans datasets in user bundle
+          desc 'prune', 'Prune orphans datasets in user bundle'
+          long_desc <<-LONGDESC
+            Prune orphans datasets in user bundle\n
+            with --force, force pruning of dataset [DANGER]
+          LONGDESC
+          option :force, type: :boolean, aliases: '-F'
+          def prune
+            begin
+                ok = (options[:force]) ?  true : TTY::Prompt.new.yes?("Do you want to prune datasets?")
+                if ok
+                    Appifier::Components::Dataset::prune
+                    @finisher.terminate exit_case: :quiet_exit
+                else
+                    puts "Pruning cancelled"
+                    @finisher.terminate exit_case: :quiet_exit
+                end
+            rescue TTY::Reader::InputInterrupt
+                @output.warn "Command interrupted"
+                @finisher.terminate exit_case: :interrupt
+            end   
+          end
+        end
+      end
+    end
+end

data/lib/appifier/cli/templates.rb

@@ -14,16 +14,20 @@ module Appifier
         # Thor method : list availables templates in user bundle
         desc 'ls', 'list templates availables in user bundle'
         def ls
-          Appifier::Components::Template::list
-          @finisher.terminate exit_case: :quiet_exit
+          begin
+            Appifier::Components::Template::list
+            @finisher.terminate exit_case: :quiet_exit
+          rescue RuntimeError => e
+            @output.error e.message
+            @finisher.terminate exit_case: :error_exit
+          end 
         end
 
         # Thor method : remove a template from user bundle
-        desc 'rm', 'rm templates from user bundle'
+        desc 'rm TEMPLATE', 'Remove templates from user bundle'
         def rm(template)
           begin 
             Appifier::Components::Template::rm(template)
-            @output.info "Template #{template} removed" 
             @finisher.terminate exit_case: :quiet_exit
           rescue RuntimeError => e
             @output.error e.message
@@ -32,7 +36,7 @@ module Appifier
         end
 
         # Thor method : show information for a specific template in user bundle
-        desc 'show', 'show information for a specific template in user bundle'
+        desc 'show TEMPLATE', 'show information for a specific template in user bundle'
         def show(template)
           begin
             Appifier::Components::Template::show(template)
@@ -50,7 +54,7 @@ module Appifier
         end
 
         # Thor method : display directory tree view for a specific template in user bundle
-        desc 'treeview', 'display directory tree view for a specific template in user bundle'
+        desc 'treeview TEMPLATE', 'display directory tree view for a specific template in user bundle'
         def treeview(template)
           begin
             Appifier::Components::Template::treeview(template)
@@ -62,7 +66,7 @@ module Appifier
         end
 
         # Thor method : lint a specific template in user bundle
-        desc 'lint', 'Lint a specific template in user bundle'
+        desc 'lint TEMPLATE', 'Lint a specific template in user bundle'
         def lint(template)
           begin
             Appifier::Components::Template::lint(template)

data/lib/appifier/cli.rb

@@ -21,6 +21,9 @@ module Appifier
         true
       end
 
+      desc 'datasets SUBCOMMAND ...ARGS', 'Managing apps datasets'
+      subcommand 'datasets', Subcommands::Datasets
+
       desc 'templates SUBCOMMAND ...ARGS', 'Managing apps templates'
       subcommand 'templates', Subcommands::Templates
 
@@ -39,27 +42,34 @@ module Appifier
       option :force, type: :boolean, aliases: '-F'
       def generate(template, target = '.')
         root = "#{File.expand_path(Appifier::DEFAULT_TEMPLATES_PATH)}/#{template}"
-        source  = "#{root}/skeleton"
-        
+        unless File::exist? root 
+          @output.error "Template not found #{template}"
+          @finisher.terminate exit_case: :error_exit
+        end
         if File::exist? File::expand_path("#{DEFAULT_DATASETS_PATH}/#{template}.yml") then
           dataset = open_dataset(template: template)
           @output.info "Dataset file found for #{template}"
         else
-          @output.warn "Dataset file not found for #{template}"
-          if TTY::Prompt.new.yes?("Do you want to collect dataset interactively ?")
-            @output.info "Beginning interactive Dataset input for #{template}"
-            collector = Appifier::Actors::Collector.new template: template
-            collector.collect 
-            dataset = open_dataset(template: template)
-          else
-            puts "=> Exiting run 'appifier collect #{template}' for collecting data"
-            puts " (use -S for collecting from STDIN or -f <FILE>)  "
-            @finisher.terminate exit_case: :quiet_exit
+          begin 
+            @output.warn "Dataset file not found for #{template}"
+            if TTY::Prompt.new.yes?("Do you want to collect dataset interactively ?")
+              @output.info "Beginning interactive Dataset input for #{template}"
+              collector = Appifier::Actors::Collector.new template: template
+              collector.collect 
+              dataset = open_dataset(template: template)
+            else
+              puts "=> Exiting run 'appifier collect #{template}' for collecting data"
+              puts " (use -S for collecting from STDIN or -f <FILE>)  "
+              @finisher.terminate exit_case: :quiet_exit
+            end
+          rescue TTY::Reader::InputInterrupt
+            @output.warn "Command interrupted"
+            @finisher.terminate exit_case: :interrupt
           end
         end
 
         begin
-          generator = Appifier::Actors::Generator.new src_root: source, target_root: File.expand_path(target), dataset: dataset
+          generator = Appifier::Actors::Generator.new template_root: root, target_root: File.expand_path(target), dataset: dataset
           generator.generate dry_run: options[:simulate], force: options[:force]
           @finisher.terminate exit_case: :quiet_exit
         rescue RuntimeError => e

data/lib/appifier/components/dataset.rb

@@ -0,0 +1,60 @@
+module Appifier
+    module Components
+        class Dataset
+
+            extend Carioca::Injector
+            inject service: :output
+    
+
+            def self.list
+                output.info "List of available Datasets for user : #{current_user} :"
+                templates_path = File.expand_path(Appifier::DEFAULT_TEMPLATES_PATH)
+                datasets_path = File.expand_path(Appifier::DEFAULT_DATASETS_PATH)
+                templates = Dir.glob("#{templates_path}/*").map { |item| item.delete_prefix("#{templates_path}/") }
+                Dir.glob("#{datasets_path}/*").map { |item| item.delete_prefix("#{datasets_path}/") }.each do |file|
+                    dataset = File::basename(file,'.yml')
+                    res = dataset; res << " [TEMPLATE MISSING]" unless templates.include? dataset 
+                    output.item res
+                end
+            end
+
+
+            def self.prune
+                output.info "Pruning Datasets for user : #{current_user} :"
+                templates_path = File.expand_path(Appifier::DEFAULT_TEMPLATES_PATH)
+                datasets_path = File.expand_path(Appifier::DEFAULT_DATASETS_PATH)
+                templates = Dir.glob("#{templates_path}/*").map { |item| item.delete_prefix("#{templates_path}/") }
+                Dir.glob("#{datasets_path}/*").each do |file|
+                    dataset = File::basename(file,'.yml')
+                    unless templates.include? dataset 
+                        FileUtils::rm file 
+                        output.item "Pruned : #{dataset}"
+                    end
+                end
+            end
+
+
+            def self.show(dataset)
+                raise "Not yet Implemented"
+            end
+
+            def self.rm(dataset)
+                output.info "Removing dataset #{dataset} for user : #{current_user}"
+                dataset_path = File.expand_path(Appifier::DEFAULT_DATASETS_PATH)
+                begin
+                if File::exist? "#{dataset_path}/#{dataset}.yml"
+                    FileUtils.rm_rf "#{dataset_path}/#{dataset}.yml"
+                    output.ok "Dataset #{dataset} deleted of bundle for user #{current_user}"
+                else
+                    raise "Dataset #{dataset} not found in bundle for user #{current_user}"
+                end
+                rescue Errno::ENOENT
+                    raise "Dataset #{dataset} not found in bundle for user #{current_user}"
+                end
+            end
+
+
+
+        end
+    end
+end

data/lib/appifier/components/template.rb

@@ -52,7 +52,7 @@ module Appifier
       end
       
       def self.list
-        output.info "List of avaible templates for user : #{current_user} :"
+        output.info "List of available templates for user : #{current_user} :"
         template_path = File.expand_path(Appifier::DEFAULT_TEMPLATES_PATH)
         Dir.glob("#{template_path}/*").map { |item| item.delete_prefix("#{template_path}/") }.each do |template|
           output.item "#{template}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appifier
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Camille Paquet
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-28 00:00:00.000000000 Z
+date: 2022-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: code_statistics
@@ -279,8 +279,10 @@ files:
 - lib/appifier/actors/retriever.rb
 - lib/appifier/cli.rb
 - lib/appifier/cli/configuration.rb
+- lib/appifier/cli/datasets.rb
 - lib/appifier/cli/templates.rb
 - lib/appifier/components/Appifile.rb
+- lib/appifier/components/dataset.rb
 - lib/appifier/components/init.rb
 - lib/appifier/components/template.rb
 - lib/appifier/helpers/archives.rb