factor 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e28a2f08cdba9af411b81e73a76fb45e636a29a6
-  data.tar.gz: 1713d9bf5e5ec9fc52bfd9d676b9889e4397528c
+  metadata.gz: 26eb148636a08597d3d15057a3536d5b1780f9c8
+  data.tar.gz: 87b420da894fa98fd2f9e151982a63008ea452cd
 SHA512:
-  metadata.gz: fd78594288d0f1f86e07fd92d3207c429f09a0df1867601d9d8efa709360a7309411bd550bce7f2691ff8e79cbbefb0e5ec6640b0445868eae2727ac26bbec44
-  data.tar.gz: 674bb6adeb7232d7988a7538547bdb9f0fe481361d7048184ba0f4788794a72d8cd50b766305111729ecf1e9849ffab51579bb7ad5eff7441ae129296fa40a9a
+  metadata.gz: 90c063260db5e9fc933991d4bedfb17b52c52e1908f5fbb0a1ab53fd5acfbf03eca4027947b99c854aea968fbfd732f7db69d3d1096c2fe6783be2a37e665d37
+  data.tar.gz: fb996d555b5542c5dda46e198e2fb84cf8a642308843a4d4edaa2946f4985e3ff68b5058b4fa495c952fc18a832acddc47f04406b469415bce1536002278bb58

data/bin/factor

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 # -*- mode: ruby -*-
 
-require File.expand_path('../../lib/factor', __FILE__)
+require File.expand_path('../../lib/commands', __FILE__)

data/lib/{factor.rb → commands.rb}

@@ -3,8 +3,8 @@
 require 'commander/import'
 
 require 'factor/version'
-require 'commands/workflows'
-require 'commands/registry'
+require 'commands/workflow_command'
+require 'commands/registry_command'
 
 program :name, 'Factor.io Server'
 program :version, Factor::VERSION
@@ -17,20 +17,20 @@ command 'server' do |c|
   c.option '--credentials FILE', String, 'credentials.yml file path.'
   c.option '--connectors FILE', String, 'connectors.yml file path'
   c.option '--path FILE', String, 'Path to workflows'
-  c.when_called Factor::Commands::Workflow, :server
+  c.when_called Factor::Commands::WorkflowCommand, :server
 end
 
 command 'cloud' do |c|
   c.syntax = 'factor host <account id> <workflow id> <api key>'
   c.description = 'Start the Factor.io Server using your workflows and credentials from Factor.io Cloud'
   c.option '--host URL', String, 'Use non-default Cloud service provider (e.g. pro server)'
-  c.when_called Factor::Commands::Workflow, :cloud
+  c.when_called Factor::Commands::WorkflowCommand, :cloud
 end
 
 command 'registry workflows' do |c|
   c.syntax = 'factor registry workflows'
   c.description = 'Get list of available workflow jumpstarts'
-  c.when_called Factor::Commands::Registry, :workflows
+  c.when_called Factor::Commands::RegistryCommand, :workflows
 end
 
 command 'registry workflows add' do |c|
@@ -39,13 +39,13 @@ command 'registry workflows add' do |c|
   c.option '--credentials FILE', String, 'credentials.yml file path.'
   c.option '--connectors FILE', String, 'connectors.yml file path'
   c.option '--values \'{"api_key":"foo"}\'', String, "{}"
-  c.when_called Factor::Commands::Registry, :add_workflow
+  c.when_called Factor::Commands::RegistryCommand, :add_workflow
 end
 
 command 'registry connectors' do |c|
   c.syntax = 'factor registry connectors'
   c.description = 'Get list of available connectors'
-  c.when_called Factor::Commands::Registry, :connectors
+  c.when_called Factor::Commands::RegistryCommand, :connectors
 end
 
 command 'registry connector add' do |c|
@@ -54,7 +54,7 @@ command 'registry connector add' do |c|
   c.option '--credentials FILE', String, 'credentials.yml file path.'
   c.option '--connectors FILE', String, 'connectors.yml file path'
   c.option '--values \'{"api_key":"foo"}\'', String, "{}"
-  c.when_called Factor::Commands::Registry, :add_connector
+  c.when_called Factor::Commands::RegistryCommand, :add_connector
 end
 
 alias_command 's', 'server'

data/lib/commands/base.rb

@@ -4,40 +4,21 @@ require 'colored'
 require 'configatron'
 require 'yaml'
 require 'fileutils'
+require 'logger/basic'
 
 module Factor
   module Commands
     # Base command with common methods used by all commands
     class Command
+      attr_accessor :logger
+
       DEFAULT_FILENAME = {
         connectors:   File.expand_path('./connectors.yml'),
         credentials:  File.expand_path('./credentials.yml')
       }
 
-      attr_accessor :destination_stream
-
-      def info(options = {})
-        log_line :info, options
-      end
-
-      def error(options = {})
-        log_line :error, options
-      end
-
-      def warn(options = {})
-        log_line :warn, options
-      end
-
-      def success(options = {})
-        log_line :success, options
-      end
-
-      def exception(message, exception)
-        error 'message' => message
-        error 'message' => "  #{exception.message}"
-        exception.backtrace.each do |line|
-          error 'message' => "    #{line}"
-        end
+      def initialize
+        @logger = Factor::Log::BasicLogger.new
       end
 
       def load_config(options = {})
@@ -77,46 +58,7 @@ module Factor
         end
         configatron[config_type].configure_from_hash(data)
       rescue => ex
-        exception "Couldn't load #{config_type} from #{absolute_path}", ex
-      end
-
-      def log_line(section, options = {})
-        options       = { message: options } if options.is_a?(String)
-        tag           = tag(options)
-        message       = options['message'] || options[:message]
-        section_text  = format_section(section)
-        write "[ #{section_text} ] [#{time}]#{tag} #{message}" if message
-      end
-
-      def format_section(section)
-        formated_section = section.to_s.upcase.center(10)
-        case section
-        when :error then formated_section.red
-        when :info then formated_section.bold
-        when :warn then formated_section.yellow
-        when :success then formated_section.green
-        else formated_section
-        end
-      end
-
-      def tag(options)
-        primary = options['service_id'] || options['instance_id']
-        secondary = if options['service_id'] && options['instance_id']
-                      ":#{options['instane_id']}"
-                    else
-                      ''
-                    end
-        primary ? "[#{primary}#{secondary}]" : ''
-      end
-
-      def time
-        Time.now.localtime.strftime('%m/%d/%y %T.%L')
-      end
-
-      def write(message)
-        stream = @destination_stream || $stdout
-        stream.puts(message)
-        stream.flush
+        logger.error "Couldn't load #{config_type} from #{absolute_path}", exception:ex
       end
     end
   end

data/lib/commands/{registry.rb → registry_command.rb}

@@ -10,7 +10,7 @@ require 'commands/base'
 module Factor
   module Commands
     # Workflow is a Command to start the factor runtime from the CLI
-    class Registry < Factor::Commands::Command
+    class RegistryCommand < Factor::Commands::Command
 
       def workflows(args, options)
         list = get_yaml_data 'https://raw.githubusercontent.com/factor-io/index/master/workflows.yml'

data/lib/commands/{workflows.rb → workflow_command.rb}

@@ -3,14 +3,15 @@
 require 'configatron'
 
 require 'commands/base'
-require 'runtime'
+require 'runtime/workflow'
 
 module Factor
   module Commands
     # Workflow is a Command to start the factor runtime from the CLI
-    class Workflow < Factor::Commands::Command
+    class WorkflowCommand < Factor::Commands::Command
       def initialize
         @workflows = {}
+        super
       end
 
       def server(_args, options)
@@ -23,7 +24,7 @@ module Factor
         load_config(config_settings)
         load_all_workflows(workflow_filename)
         block_until_interupt
-        info 'Good bye!'
+        logger.info 'Good bye!'
       end
 
       def cloud(args, options)
@@ -31,35 +32,35 @@ module Factor
         host        = (options.host || "https://factor.io").sub(/(\/)+$/,'')
 
         if !api_key || !workflow_id || !account_id
-          error "API Key, Worklfow ID and Acount ID are all required"
+          logger.error "API Key, Worklfow ID and Acount ID are all required"
           exit
         end
 
-        info "Getting workflow (#{workflow_id}) from Factor.io Cloud"
+        logger.info "Getting workflow (#{workflow_id}) from Factor.io Cloud"
         begin
           workflow_url = "#{host}/#{account_id}/workflows/#{workflow_id}.json?auth_token=#{api_key}"
           raw_content = RestClient.get(workflow_url)
           workflow_info = JSON.parse(raw_content)
         rescue => ex
-          error "Couldn't retreive workflow: #{ex.message}"
+          logger.error "Couldn't retreive workflow: #{ex.message}"
           exit
         end
 
         workflow_definition = workflow_info["definition"]
 
-        info "Getting credentials from Factor.io Cloud"
+        logger.info "Getting credentials from Factor.io Cloud"
         begin
           credential_url = "#{host}/#{account_id}/credentials.json?auth_token=#{api_key}"
           raw_content = RestClient.get(credential_url)
           credentials = JSON.parse(raw_content)
         rescue => ex
-          error "Couldn't retreive workflow: #{ex.message}"
+          logger.error "Couldn't retreive workflow: #{ex.message}"
           exit
         end
 
         configatron[:credentials].configure_from_hash(credentials)
 
-        info "Getting connectors from Factor.io Cloud"
+        logger.info "Getting connectors from Factor.io Cloud"
         connectors = {}
         begin
           connectors_url = "#{host}/#{account_id}/connectors.json?auth_token=#{api_key}"
@@ -70,7 +71,7 @@ module Factor
             connectors[connector_id] = connector_info['connectors'].values.first
           end
         rescue => ex
-          error "Couldn't retreive workflow: #{ex.message}"
+          logger.error "Couldn't retreive workflow: #{ex.message}"
           exit
         end
 
@@ -80,7 +81,7 @@ module Factor
 
         block_until_interupt
 
-        info 'Good bye!'
+        logger.info 'Good bye!'
       end
 
       private
@@ -90,22 +91,22 @@ module Factor
         glob = "#{workflow_filename}#{glob_ending}*.rb"
         file_list = Dir.glob(glob)
         if !file_list.all? { |file| File.file?(file) }
-          error "#{workflow_filename} is neither a file or directory"
+          logger.error "#{workflow_filename} is neither a file or directory"
         elsif file_list.count == 0
-          error 'No workflows in this directory to run'
+          logger.error 'No workflows in this directory to run'
         else
           file_list.each { |filename| load_workflow(File.expand_path(filename)) }
         end
       end
 
       def block_until_interupt
-        info 'Ctrl-c to exit'
+        logger.info 'Ctrl-c to exit'
         begin
           loop do
             sleep 1
           end
         rescue Interrupt
-          info 'Exiting app...'
+          logger.info 'Exiting app...'
         ensure
           @workflows.keys.each { |workflow_id| unload_workflow(workflow_id) }
         end
@@ -113,11 +114,11 @@ module Factor
 
       def load_workflow(workflow_filename)
         # workflow_filename = File.expand_path(filename)
-        info "Loading workflow from #{workflow_filename}"
+        logger.info "Loading workflow from #{workflow_filename}"
         begin
           workflow_definition = File.read(workflow_filename)
         rescue => ex
-          exception "Couldn't read file #{workflow_filename}", ex
+          logger.error "Couldn't read file #{workflow_filename}", exception:ex
           return
         end
 
@@ -125,23 +126,22 @@ module Factor
       end
 
       def load_workflow_from_definition(workflow_definition)
-        info "Setting up workflow processor"
+        logger.info "Setting up workflow processor"
         begin
           connector_settings = configatron.connectors.to_hash
           credential_settings = configatron.credentials.to_hash
-          runtime = Runtime.new(connector_settings, credential_settings)
-          runtime.logger = method(:log_message)
+          runtime = Factor::Runtime::Workflow.new(connector_settings, credential_settings, logger: logger)
         rescue => ex
-          message = "Couldn't setup workflow process for #{workflow_filename}"
-          exception message, ex
+          message = "Couldn't setup workflow process"
+          logger.error message:message, exception:ex
         end
 
         workflow_thread = fork do
           begin
-            info "Starting workflow"
+            logger.info "Starting workflow"
             runtime.load(workflow_definition)
           rescue => ex
-            exception "Couldn't workflow", ex
+            logger.error message: "Couldn't workflow", exception: ex
           end
         end
 
@@ -149,18 +149,9 @@ module Factor
       end
 
       def unload_workflow(workflow_id)
-        info "Stopping #{workflow_id}"
+        logger.info "Stopping #{workflow_id}"
         Process.kill('SIGINT', @workflows[workflow_id])
       end
-
-      def log_message(message_info)
-        case message_info['status']
-        when 'info' then info message_info
-        when 'success' then success message_info
-        when 'warn' then warn message_info
-        else error message_info
-        end
-      end
     end
   end
 end

data/lib/common/deep_struct.rb

@@ -0,0 +1,48 @@
+require 'ostruct'
+
+module Factor
+  module Common
+    class DeepStruct < OpenStruct
+      def initialize(hash=nil)
+        @table = {}
+        @hash_table = {}
+
+        if hash
+          hash.each do |k,v|
+            @table[k.to_sym] = (v.is_a?(Hash) ? self.class.new(v) : v)
+            @hash_table[k.to_sym] = v
+
+            new_ostruct_member(k)
+          end
+        end
+      end
+
+      def to_h
+        @hash_table
+      end
+
+      def [](idx)
+        hash = marshal_dump
+        hash[idx.to_sym]
+      end
+    end
+
+    def self.flat_hash(h,f=[],g={})
+      return g.update({ f=>h }) unless h.is_a? Hash
+      h.each { |k,r| flat_hash(r,f+[k],g) }
+      g
+    end
+
+    def self.simple_object_convert(item)
+      if item.is_a?(Hash)
+        Factor::Common::DeepStruct.new(item)
+      elsif item.is_a?(Array)
+        item.map do |i|
+          simple_object_convert(i)
+        end
+      else
+        item
+      end
+    end
+  end
+end

data/lib/factor/version.rb

@@ -2,5 +2,5 @@
 
 # Primary Factor.io module
 module Factor
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

data/lib/logger/basic.rb

@@ -0,0 +1,68 @@
+require_relative './logger.rb'
+
+module Factor
+  module Log
+    class BasicLogger  < Factor::Log::Logger
+
+      attr_accessor :destination_stream
+
+      def log(section, options={})
+        options       = { message: options } if options.is_a?(String)
+        tag           = tag(options)
+        message       = options['message'] || options[:message]
+        section_text  = format_section(section)
+        write "[ #{section_text} ] [#{time}]#{tag} #{message}" if message
+        exception options[:exception] if options[:exception]
+      end
+
+      def info(options = {})
+        log :info, options
+      end
+
+      def warn(options = {})
+        log :warn, options
+      end
+
+      def error(options = {})
+        log :error, options
+      end 
+
+      def success(options = {})
+        log :success, options
+      end
+
+      private
+
+      def exception(exception)
+        error message: "  #{exception.message}"
+        exception.backtrace.each do |line|
+          error message: "    #{line}"
+        end
+      end
+
+      def format_section(section)
+        formated_section = section.to_s.upcase.center(10)
+        case section.to_sym
+        when :error then formated_section.red
+        when :info then formated_section.bold
+        when :warn then formated_section.yellow
+        when :success then formated_section.green
+        else formated_section
+        end
+      end
+
+      def tag(options)
+        primary = options['service_id'] || options['instance_id']
+        secondary = ":#{options['instane_id']}" if options['service_id'] && options['instance_id']
+        primary ? "[#{primary}#{secondary || ''}]" : ''
+      end
+
+      def write(message)
+        stream = @destination_stream || $stdout
+        stream.puts(message)
+        stream.flush
+      end
+
+    end
+  end
+end