wisco 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b480d047c6f25a2c8ad8e234e034cb1d1cb571efbd9620b405a90a9e7816a807
-  data.tar.gz: baac61b7895d1a8fa7046a675910ecacfcae4e03afab83fa42d371f5a8a19b0b
+  metadata.gz: 3a60475b816732d204bb52da3c9b4a17c90ebd3471eb05254cc153c68ac5ad5b
+  data.tar.gz: 482f28c284946b0b915aa25a2abaefecd983a7b1e26b824f0576ab609e42d276
 SHA512:
-  metadata.gz: f15e57668b56c77e593da83dbc759663d1bf2a7c3bb7f39fe7dc03bfea50365df9356aa7e996d9e060a34b5ba1f1946172d5cdbe91c92c02c49e72eec606a26f
-  data.tar.gz: d8339fb1ea9942a124a8cbd260ffd74912504dbe5ed38f24ba817e82bad9f930ebcb75f270f65afe23a09a82bbb2161bfee40c0adc96a76049ec698c90e62e2c
+  metadata.gz: 5b3340475edcafba79c184332e869d33fa230c61ba9f769f89a2ec1da1081449b3e14f29b3bf6afc02a701bb9d4195a00909fb11642a4bbc5c8ce033c7d064c6
+  data.tar.gz: 5e526ccb7fdba3d62c2c35af71c2b81f904820eba2fa626bba2d1679167c2c4d0f642b34ee062ccdd232a6467106341d87694d9219ac2e7b5c0362c50db0eb60

data/lib/wisco/commands/exec.rb

@@ -10,7 +10,7 @@ module Wisco
     module Exec
       module_function
 
-      def run(path_arg, target_dir, input: nil, debug: false)
+      def run(path_arg, target_dir, input: nil, pagination: true, debug: false)
         target_dir = File.expand_path(target_dir)
         config_path = Wisco.config_path(target_dir)
 
@@ -51,7 +51,8 @@ module Wisco
           if input_files.empty?
             if %w[pick_lists methods].include?(section)
               # No-param pick list or method — execute once with no input file
-              execute_one(section, key, nil, fixtures_dir, connector_full_path, connection, debug: debug)
+              execute_one(section, key, nil, fixtures_dir, connector_full_path, connection,
+                          pagination: pagination, debug: debug)
             else
               warn "\tWarning: No ready input files found in #{fixture_dir_output}"
             end
@@ -60,7 +61,7 @@ module Wisco
 
           input_files.each do |input_file|
             execute_one(section, key, input_file, fixtures_dir,
-                        connector_full_path, connection, debug: debug)
+                        connector_full_path, connection, pagination: pagination, debug: debug)
           end
         end
       end
@@ -92,13 +93,20 @@ module Wisco
         first_line == Wisco::Commands::Fixtures::SENTINEL
       end
 
-      def execute_one(section, key, input_file, fixtures_dir, connector_full_path, connection, debug: false)
+      def execute_one(section, key, input_file, fixtures_dir, connector_full_path, connection,
+                      pagination: true, debug: false)
         stem        = input_file ? File.basename(input_file, '.*') : 'execute'
         output_file = File.join(fixtures_dir, "output_#{stem}.json")
         error_file  = File.join(fixtures_dir, "error_#{stem}.txt")
 
         use_args  = %w[pick_lists methods].include?(section)
-        exec_path = use_args ? "#{section}.#{key}" : "#{section}.#{key}.execute"
+        exec_path = if use_args
+                      "#{section}.#{key}"
+                    elsif section == 'triggers'
+                      pagination ? "#{section}.#{key}.poll" : "#{section}.#{key}.poll_page"
+                    else
+                      "#{section}.#{key}.execute"
+                    end
 
         options = { connector: connector_full_path, output: output_file }
         options[:connection] = connection if connection

data/lib/wisco/commands/fixtures.rb

@@ -47,24 +47,45 @@ module Wisco
           elsif section == 'methods'
             process_method(key, connector, fixtures_dir, overwrite: overwrite)
           else
+            # ── config_fields pre-check ──────────────────────────────────────
+            item   = connector[section.to_sym]&.[](key.to_sym)
+            raw_cf = item&.[](:config_fields)
+            cf_file = File.join(fixtures_dir, 'config_fields.json')
+            cf_opt  = nil   # set to cf_file once the user has filled it in
+
+            if raw_cf
+              if config_fields_ready?(cf_file)
+                cf_opt = cf_file
+              else
+                write_config_fields_template(raw_cf, cf_file)
+                warn "  Written:  #{cf_file}"
+                warn "  Action required: fill in config_fields.json, then re-run fixtures."
+                next
+              end
+            end
+
+            # ── input_fields ─────────────────────────────────────────────────
             input_fields_file = File.join(fixtures_dir, 'input_fields.json')
             call_exec(
-              path: "#{section}.#{key}.input_fields",
-              connector: connector_full_path,
-              connection: connection,
-              output: input_fields_file,
-              debug: debug
+              path:          "#{section}.#{key}.input_fields",
+              connector:     connector_full_path,
+              connection:    connection,
+              output:        input_fields_file,
+              config_fields: cf_opt,
+              debug:         debug
             )
 
             generate_execute_input(input_fields_file, fixtures_dir, overwrite: overwrite, debug: debug)
 
+            # ── output_fields ────────────────────────────────────────────────
             output_fields_file = File.join(fixtures_dir, 'output_fields.json')
             call_exec(
-              path: "#{section}.#{key}.output_fields",
-              connector: connector_full_path,
-              connection: connection,
-              output: output_fields_file,
-              debug: debug
+              path:          "#{section}.#{key}.output_fields",
+              connector:     connector_full_path,
+              connection:    connection,
+              output:        output_fields_file,
+              config_fields: cf_opt,
+              debug:         debug
             )
           end
         end
@@ -200,9 +221,36 @@ module Wisco
         puts "  Written: #{output_file}"
       end
 
-      def call_exec(path:, connector:, connection:, output:, debug: false)
+      def config_fields_ready?(path)
+        return false unless File.exist?(path)
+
+        first_line = begin
+                       File.open(path, &:readline).chomp
+                     rescue StandardError
+                       ''
+                     end
+        first_line != SENTINEL
+      end
+
+      def write_config_fields_template(config_fields_array, output_file)
+        stringified = stringify_keys_deep(config_fields_array)
+        template    = schema_to_template(stringified)
+        content     = "#{SENTINEL}\n#{JSON.pretty_generate(template)}\n"
+        File.write(output_file, content)
+      end
+
+      def stringify_keys_deep(obj)
+        case obj
+        when Hash  then obj.transform_keys(&:to_s).transform_values { |v| stringify_keys_deep(v) }
+        when Array then obj.map { |e| stringify_keys_deep(e) }
+        else            obj
+        end
+      end
+
+      def call_exec(path:, connector:, connection:, output:, config_fields: nil, debug: false)
         options = { connector: connector, output: output }
-        options[:connection] = connection if connection
+        options[:connection]    = connection    if connection
+        options[:config_fields] = config_fields if config_fields
 
         if debug
           warn "[fixtures] path:       #{path}"

data/lib/wisco/version.rb

@@ -1,3 +1,3 @@
 module Wisco
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end

data/lib/wisco.rb

@@ -82,14 +82,17 @@ module Wisco
         actions             all keys in that section
         get_users           auto-detect section
     DESC
-    option :input, type: :string,  desc: 'Specific input file'
-    option :debug, type: :boolean, default: false, desc: 'Print ExecCommand call details'
+    option :input,      type: :string,  desc: 'Specific input file'
+    option :pagination, type: :boolean, default: true,
+                        desc: 'Triggers only: true = .poll (with pagination), false = .poll_page (without)'
+    option :debug,      type: :boolean, default: false, desc: 'Print ExecCommand call details'
     def exec(path_arg, target_dir = nil)
       Wisco::Commands::Exec.run(
         path_arg,
         target_dir || Dir.pwd,
-        input: options[:input],
-        debug: options[:debug]
+        input:      options[:input],
+        pagination: options[:pagination],
+        debug:      options[:debug]
       )
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wisco
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - mbillington