factor 0.0.91 → 0.0.92

data/bin/factor

@@ -1,5 +1,12 @@
 #!/usr/bin/env ruby
 require "rubygems"
-require "factor"
 
-Factor::CLI::Factor.start
+require "pathname"
+bin_file = Pathname.new(__FILE__).realpath
+
+# add self to libpath
+$:.unshift File.expand_path("../../lib", bin_file)
+require 'factor'
+
+
+Factor::CLI::FactorTask.start

data/lib/cli/{channel.rb → channel_task.rb}

@@ -5,7 +5,7 @@ require 'zip/zipfilesystem'
 
 module Factor
   module CLI
-    class Channel < Command
+    class ChannelTask < Command
 
       desc "call CHANNEL METHOD TARGET","start a workflow"
       method_option :parameters, :type=>:hash, :default=>{}, :required=>false

data/lib/cli/{credential.rb → credential_task.rb}

@@ -3,7 +3,7 @@ require 'cli/command'
 
 module Factor
   module CLI
-    class Credential < Command
+    class CredentialTask < Command
     
       desc "list [KEY]", "list all the credentials"
       #method_option :key, :alias=>"-k", :type=>:string, :desc=>"key reference"

data/lib/cli/factor_task.rb

@@ -0,0 +1,27 @@
+require 'rubygems'
+require 'cli/command'
+require 'cli/server_task'
+require 'cli/workflow_task'
+require 'cli/credential_task'
+
+module Factor
+  module CLI
+    class FactorTask < Command
+  
+      desc "login EMAIL TOKEN", "login with token"
+      # method_option :email, :alias=>"-e", :type=>:string, :desc=>"Email address for Factor account", :required=>true
+      # method_option :token, :alias=>"-t", :type=>:string, :desc=>"Token value to set", :required=>true
+      def login(email,token)
+        config = get_config
+        config[:email]=email
+        config[:token]=token
+        save_config(config)
+      end
+    end
+  end
+end
+
+Factor::CLI::FactorTask.register(Factor::CLI::ServerTask, "server","server","start and list servers")
+Factor::CLI::FactorTask.register(Factor::CLI::WorkflowTask,"workflow","workflow","start and list workflows")
+Factor::CLI::FactorTask.register(Factor::CLI::ChannelTask,"channel","channel","install,uninstall, list channels")
+Factor::CLI::FactorTask.register(Factor::CLI::CredentialTask,"credential","credential","manage remote credential store")

data/lib/cli/{server.rb → server_task.rb}

@@ -3,7 +3,7 @@ require 'cli/command'
 
 module Factor
   module CLI
-    class Server < Command
+    class ServerTask < Command
       desc "start", "start the server"
       method_option :tags, :alias=>"-t", :type=>:hash, :desc=>"Optional tags to identify from workflow"
       method_option :channels, :type=>:array, :desc=>"Optional channel ruby file list for development"

data/lib/cli/{workflow.rb → workflow_task.rb}

@@ -3,7 +3,7 @@ require 'cli/command'
 
 module Factor
   module CLI
-    class Workflow < Command
+    class WorkflowTask < Command
   
       desc "call WORKFLOW","start a workflow"
       method_option :parameters, :type=>:hash, :default=>{}, :required=>false

data/lib/client/client.rb

@@ -61,7 +61,7 @@ module Factor
           uri = URI.parse(channel['zip_url'])
         
           # temp file to store the zip for download
-          temp_file = Tempfile.new([uri.to_s.gsub(/\W+/,'-'), '.zip'], :encoding => 'ascii-8bit')
+          temp_file = Tempfile.new([uri.path.gsub(/\W+/,'-'), '.zip'], :encoding => 'ascii-8bit')
         
           # temp directory where zip will be decompressed
           unzip_dir=temp_file.path[0..-5]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.0.91
+  version: 0.0.92
   prerelease: 
 platform: ruby
 authors:
@@ -150,12 +150,12 @@ files:
 - lib/channel/channel.rb
 - lib/channel/event.rb
 - lib/channel/trigger.rb
-- lib/cli/channel.rb
+- lib/cli/channel_task.rb
 - lib/cli/command.rb
-- lib/cli/credential.rb
-- lib/cli/factor.rb
-- lib/cli/server.rb
-- lib/cli/workflow.rb
+- lib/cli/credential_task.rb
+- lib/cli/factor_task.rb
+- lib/cli/server_task.rb
+- lib/cli/workflow_task.rb
 - lib/client/client.rb
 - lib/factor.rb
 - lib/runtime/attributes.rb

data/lib/cli/factor.rb

@@ -1,28 +0,0 @@
-require 'rubygems'
-require 'cli/command'
-require 'cli/server'
-require 'cli/workflow'
-require 'cli/credential'
-require 'cli/channel'
-
-module Factor
-  module CLI
-    class Factor < Command
-  
-      desc "login EMAIL TOKEN", "login with token"
-      # method_option :email, :alias=>"-e", :type=>:string, :desc=>"Email address for Factor account", :required=>true
-      # method_option :token, :alias=>"-t", :type=>:string, :desc=>"Token value to set", :required=>true
-      def login(email,token)
-        config = get_config
-        config[:email]=email
-        config[:token]=token
-        save_config(config)
-      end
-    end
-  end
-end
-
-Factor::CLI::Factor.register(Factor::CLI::Server, "server","server","start and list servers")
-Factor::CLI::Factor.register(Factor::CLI::Workflow,"workflow","workflow","start and list workflows")
-Factor::CLI::Factor.register(Factor::CLI::Channel,"channel","channel","install,uninstall, list channels")
-Factor::CLI::Factor.register(Factor::CLI::Credential,"credential","credential","manage remote credential store")