factor 0.0.8 → 0.0.81

data/lib/cli/server_task.rb

@@ -9,18 +9,24 @@ module Factor
       def start
         engine = Factor::Runtime::Engine.new(get_config[:email],get_config[:token])
         
-        options.tags.each {|tag,value| engine.tag(tag,value)}
+        options.tags.each {|tag,value| engine.tag(tag,value)} if options.tags?
    
         puts "loading channels"
-        engine = @client.load_channels(engine)
+        engine = @client.load_channels(engine) do |message|
+          puts "  #{message}"
+        end
         puts "loading channels complete"
       
         puts "loading workflows"
-        engine = @client.load_workflows(engine)
+        engine = @client.load_workflows(engine) do |message|
+          puts "  #{message}"
+        end
         puts "loading workflows complete"
     
         puts "loading credentials"
-        engine = @client.load_credentials(engine)
+        engine = @client.load_credentials(engine) do |message|
+          puts "  #{message}"
+        end
         puts "loading credentials complete"
     
         puts "starting the server..."

data/lib/cli/workflow_task.rb

@@ -21,7 +21,7 @@ module Factor
       desc "list", "list all the workflows"
       #method_option :key, :alias=>"-k", :type=>:string, :desc=>"key reference"
       def list
-        puts @client.get_workflow
+        puts @client.get_workflows
       end
     
       desc "add NAME FILENAME", "add a key and value for the credential"

data/lib/client/client.rb

@@ -8,8 +8,12 @@ require 'open-uri'
 module Factor
   module Client
     class Client
-      #HOST = "http://factor.io"
-      HOST = "http://localhost:3000"
+      attr_accessor :host
+    
+      def initialize(host="http://localhost:3000")
+      #def initialize(host="http://factor.io")
+        @host=host
+      end
     
       def register(email,password)
       end
@@ -21,23 +25,69 @@ module Factor
         @token=token
       end
     
-      def load_workflows(engine)
+      def load_workflows(engine,&code)
+        code.call("downloading workflow list") 
         workflows = rest_get("workflows")
-        workflows.each do |workflow|
-          workflow_definition = JSON.parse(workflow['definition'])
+        code.call("downloaded #{workflows.size} workflows") 
+        workflows.each do |workflow_info|
+          code.call("parsing '#{workflow_info['name']}'") 
+          workflow_definition = JSON.parse(workflow_info['definition'])
+          code.call("loading '#{workflow_info['name']}' into runtime") 
           workflow=Factor::Runtime::Workflow.new(workflow_definition)
           engine.load_workflow(workflow)
+          code.call("loading complete for '#{workflow_info['name']}'") 
         end
         engine
       end
     
-      def load_credentials(engine)
+      def load_credentials(engine,&code)
+        code.call("downloading credential list")
         credentials = rest_get("credentials")
+        code.call("loading credentials")
         engine.load_credentials(credentials)
       
         engine
       end
     
+      def load_channels(engine,&code)
+      
+        # get list of channels
+        code.call("downloading channels list")
+        channels = rest_get("channels")
+      
+        #load each channel
+        channels.each do |channel|
+          code.call("downloading '#{channel['zip_url']}'")
+          # URI of the zip file containing the module
+          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 directory where zip will be decompressed
+          unzip_dir=temp_file.path[0..-5]
+        
+          # download
+          open(uri.to_s,"rb") do |bin|
+            temp_file.print bin.read
+          end
+          temp_file.close
+        
+          code.call("unzipping '#{channel['name']}'")
+          # unzip download zip into unzipped directory
+          unzip(temp_file.path,unzip_dir)
+        
+          code.call("loading '#{channel['zip_url']}' into engine")
+          Dir.glob("#{unzip_dir}/**/*.rb").each do |file|
+            engine.load_channel(file)
+          end
+        
+        end
+      
+      
+        engine
+      end
+    
     
       def set_credential(key,value)
         # this is a PUT not POST because it is technically editing, not creating a new one
@@ -60,9 +110,9 @@ module Factor
         rest_post("workflows",{:name=>key,:definition=>definition})
       end
       
-      # def get_workflow()
-      #   rest_get("workflows")
-      # end
+      def get_workflows()
+        rest_get("workflows")
+      end
       
       def remove_workflow(name="")
         rest_delete("workflows",{:name=>name})
@@ -75,9 +125,9 @@ module Factor
         rest_post("channels",{:name=>key,:zip=>file})
       end
       
-      # def get_channel()
-      #   rest_get("channels")
-      # end
+      def get_channels()
+        rest_get("channels")
+      end
       
       def remove_channel(name="")
         rest_delete("channels",{:name=>name})
@@ -85,41 +135,7 @@ module Factor
       
       
     
-      def load_channels(engine)
-      
-        # get list of channels
-        channels = rest_get("channels")
-      
-        #load each channel
-        channels.each do |channel|
-        
-          # URI of the zip file containing the module
-          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 directory where zip will be decompressed
-          unzip_dir=temp_file.path[0..-5]
-        
-          # download
-          open(uri.to_s,"rb") do |bin|
-            temp_file.print bin.read
-          end
-          temp_file.close
-        
-          # unzip download zip into unzipped directory
-          unzip(temp_file.path,unzip_dir)
-        
-          Dir.glob("#{unzip_dir}/#{channel['name'].downcase}/*.rb").each do |file|
-            engine.load_channel(file)
-          end
-        
-        end
-      
-      
-        engine
-      end
+
     
     
       private
@@ -173,19 +189,19 @@ module Factor
         
         param_string=params.map{|key,value| "#{key}=#{value}"}.join("&")
         
-        JSON.parse(RestClient.get("#{HOST}/#{path}.json?#{param_string}"))
+        JSON.parse(RestClient.get("#{@host}/#{path}.json?#{param_string}"))
       end
       
       def rest_put(path,params={})
         params["auth_token"]=@token
         
-        JSON.parse(RestClient.put("#{HOST}/#{path}.json",params))
+        JSON.parse(RestClient.put("#{@host}/#{path}.json",params))
       end
       
       def rest_post(path,params={})
         #params["auth_token"]=@token
         
-        JSON.parse(RestClient.post("#{HOST}/#{path}.json?auth_token=#{@token}",params))
+        JSON.parse(RestClient.post("#{@host}/#{path}.json?auth_token=#{@token}",params))
       end
       
       def rest_delete(path,params={})
@@ -193,7 +209,7 @@ module Factor
         
         param_string=params.map{|key,value| "#{key}=#{value}"}.join("&")
         
-        JSON.parse(RestClient.delete("#{HOST}/#{path}.json?#{param_string}"))
+        JSON.parse(RestClient.delete("#{@host}/#{path}.json?#{param_string}"))
       end
     
     end

data/lib/runtime/engine.rb

@@ -31,7 +31,8 @@ module Factor
         require file
         channel_module_name = File.basename(file).gsub('.rb','').split('_').map{|ea| ea.capitalize}.join('')
         channel_module= self.class.const_get(channel_module_name)
-      
+        puts "[channel_module.definition['module']] #{channel_module.definition["module"]}"
+        puts "[channel_module] #{channel_module.inspect}"
         @channel_modules[channel_module.definition["module"]]=channel_module  
       end
     
@@ -117,7 +118,9 @@ module Factor
       
       def match(target)
         return true if target==nil || target==""
-        facts Facter.collection.merge(@tags)
+        facts={}
+        Facter.each {|k,v| facts[k]=v}
+        @tags.each {|k,v| facts[k]=v}
         key,value=target.split("=")
         facts[key]==value
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.81
   prerelease: 
 platform: ruby
 authors:
@@ -123,38 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.8
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.16
 description: Friendly command-line interface and library for Factor
 email: maciej@skierkowski.com
 executables: