factor 0.0.6 → 0.0.7

data/lib/cli/channel_task.rb

@@ -1,25 +1,42 @@
 require 'rubygems'
 require 'cli/command'
+require 'zip/zip'
+require 'zip/zipfilesystem'
 
 module Factor
   module CLI
     class ChannelTask < Command
-  
-      desc "install NAME", "install a new channel"
-      def install(name)
-      end
-  
-      desc "uninstall NAME", "uninstall the channel"
-      def uninstall(name)
+
+      desc "call CHANNEL METHOD TARGET","start a workflow"
+      method_option :parameters, :type=>:hash, :default=>{}, :required=>false
+      def call(channel, method, target)
+        
+        puts "not implemented"
+
       end
   
-      desc "list", "list all my installed channels"
+      
+      
+      desc "list", "list all the channels"
+      #method_option :key, :alias=>"-k", :type=>:string, :desc=>"key reference"
       def list
+        puts @client.get_channels
       end
-  
-      desc "all", "list all channels available for installation"
-      def all
+    
+      desc "add NAME DIRECTORY", "add a key and value for the credential"
+      def add(name,directory)
+        
+        #contents=File.open(File.expand_path(filename), "rb") {|f| f.read}
+        
+        puts @client.add_channel(name,directory)
+      end
+    
+      desc "remove NAME", "remove a workflow"
+      def remove(name)
+        puts @client.remove_channel(name)
       end
+  
+
     end
   end
 end

data/lib/cli/command.rb

@@ -9,11 +9,21 @@ module Factor
   module CLI
     class Command < Thor
       CONFIG_FILE_DIR = File.expand_path("~/.factor") 
+
+      
       no_tasks do
+        
+        def initialize(*vals)
+          @client = Factor::Client::Client.new
+          @client.login_token(get_config[:token])
+          super(*vals)
+        end
+        
         def save_config(config)
           File.open(CONFIG_FILE_DIR,'w') do |file|
             YAML::dump(config,file)
           end
+          @client.login_token(get_config[:token])
         end
     
         def get_config

data/lib/cli/credential_task.rb

@@ -5,16 +5,22 @@ module Factor
   module CLI
     class CredentialTask < Command
     
-      desc "list", "list all the credentials"
-      def list
+      desc "list [KEY]", "list all the credentials"
+      #method_option :key, :alias=>"-k", :type=>:string, :desc=>"key reference"
+      def list(key="")
+        puts @client.get_credential(key)["value"]
       end
     
-      desc "add KEY VALUE", "add a key and value for the credential"
-      def add
+      desc "set KEY VALUE", "add a key and value for the credential"
+      #method_option :key, :alias=>"-k", :type=>:string, :desc=>"key reference"
+      #method_option :value, :alias=>"-v", :type=>:string, :desc=>"values"
+      def set(key,value)
+        puts @client.set_credential(key,value)
       end
     
       desc "remove KEY", "remove a value from the credentials bag"
-      def remove
+      def remove(key)
+        puts @client.remove_credential(key)
       end
     
     end

data/lib/cli/factor_task.rb

@@ -8,34 +8,13 @@ module Factor
   module CLI
     class FactorTask < Command
   
-      desc "register","register a new account"
-      method_option :email, :alias=>"-e", :type=>:string, :desc=>"Email address you would like to use for new account"
-      method_option :password, :alias=>"-p", :type=>:string, :desc=>"Password you would like to use for new account"
-      def register
-        email = options[:email]==nil ? ask("Email address:") : options[:email]
-        password = options[:password]==nil ? ask("Password:") : options[:password]
-    
-        # register with email/password
-    
-      end
-  
-      desc "login", "login to the account"
-      method_option :email, :alias=>"-u", :type=>:string, :desc=>"Account email address"
-      method_option :password, :alias=>"-p", :type=>:string, :desc=>"Account password"
-      def login
-        email = options[:email]==nil ? ask("Email address:") : options[:email]
-        password = options[:password]==nil ? ask("Password:") : options[:password]
-    
-        #login with email/password
-      end
-  
-      desc "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 token
+      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[:token]=options[:token]
-        config[:email]=options[:email]
+        config[:email]=email
+        config[:token]=token
         save_config(config)
       end
     end
@@ -45,3 +24,4 @@ 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_task.rb

@@ -7,20 +7,17 @@ module Factor
       desc "start", "start the server"
       def start
         engine = Factor::Runtime::Engine.new(get_config[:email],get_config[:token])
-
-        client = Factor::Client::Client.new
-        client.login_token(get_config[:token])
-      
+   
         puts "loading channels"
-        engine = client.load_channels(engine)
+        engine = @client.load_channels(engine)
         puts "loading channels complete"
       
         puts "loading workflows"
-        engine = client.load_workflows(engine)
+        engine = @client.load_workflows(engine)
         puts "loading workflows complete"
     
         puts "loading credentials"
-        engine = client.load_credentials(engine)
+        engine = @client.load_credentials(engine)
         puts "loading credentials complete"
     
         puts "starting the server..."

data/lib/cli/workflow_task.rb

@@ -16,11 +16,29 @@ module Factor
         puts "workflow executed with id #{id}"
       end
   
-      desc "list", "list all available workflows"
-      def list
       
       
+      desc "list", "list all the workflows"
+      #method_option :key, :alias=>"-k", :type=>:string, :desc=>"key reference"
+      def list
+        puts @client.get_workflow
       end
+    
+      desc "add NAME FILENAME", "add a key and value for the credential"
+      #method_option :key, :alias=>"-k", :type=>:string, :desc=>"key reference"
+      #method_option :value, :alias=>"-v", :type=>:string, :desc=>"values"
+      def add(name,filename)
+        contents=File.open(File.expand_path(filename), "rb") {|f| f.read}
+        puts @client.add_workflow(name,contents)
+      end
+    
+      desc "remove NAME", "remove a workflow"
+      def remove(name)
+        puts @client.remove_workflow(name)
+      end
+      
+      
+      
     end
   end
 end

data/lib/client/client.rb

@@ -2,12 +2,13 @@ require 'rubygems'
 require 'rest_client'
 require 'zip'
 require 'zip/zipfilesystem'
+require 'zip/zip'
 require 'open-uri'
 
 module Factor
   module Client
     class Client
-      HOST = "http://localhost:3000"
+      HOST = "http://factor.io"
     
       def register(email,password)
       end
@@ -30,15 +31,59 @@ module Factor
       end
     
       def load_credentials(engine)
-      
-        credentials_definition = rest_get("credentials")
-        credentials = JSON.parse(credentials_definition["bag"])
+        credentials = rest_get("credentials")
         engine.load_credentials(credentials)
       
         engine
       end
     
     
+      def set_credential(key,value)
+        # this is a PUT not POST because it is technically editing, not creating a new one
+        rest_put("credentials",{:key=>key,:value=>value})
+      end
+      
+      def get_credential(key="")
+        rest_get("credentials",{:key=>key})
+      end
+      
+      def remove_credential(key="")
+        rest_delete("credentials",{:key=>key})
+      end
+    
+    
+    
+    
+      # workflows
+      def add_workflow(key,definition)
+        rest_post("workflows",{:name=>key,:definition=>definition})
+      end
+      
+      # def get_workflow()
+      #   rest_get("workflows")
+      # end
+      
+      def remove_workflow(name="")
+        rest_delete("workflows",{:name=>name})
+      end
+      
+      
+      # channels
+      def add_channel(key,path)
+        file=zip(path)
+        rest_post("channels",{:name=>key,:zip=>file})
+      end
+      
+      # def get_channel()
+      #   rest_get("channels")
+      # end
+      
+      def remove_channel(name="")
+        rest_delete("channels",{:name=>name})
+      end
+      
+      
+    
       def load_channels(engine)
       
         # get list of channels
@@ -108,9 +153,46 @@ module Factor
         end
         FileUtils.rm(zip) if remove_after
       end
+      
+      def zip(directory)
+        path=directory.dup
+        path.sub!(%r[/$],'')
+        zip_path = File.join(path,File.basename(path))+'.zip'
+        FileUtils.rm zip_path, :force=>true
+        Zip::ZipFile.open(zip_path, 'w') do |zip|
+          Dir["#{path}/**/**"].reject{|f|f==zip_path}.each do |file|
+            zip.add(file.sub(path+'/',''),file)
+          end
+        end
+        File.open(zip_path,'r')
+      end
     
-      def rest_get(path)
-        JSON.parse(RestClient.get "#{HOST}/#{path}.json?auth_token=#{@token}")
+      def rest_get(path,params={})
+        params["auth_token"]=@token
+        
+        param_string=params.map{|key,value| "#{key}=#{value}"}.join("&")
+        
+        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))
+      end
+      
+      def rest_post(path,params={})
+        #params["auth_token"]=@token
+        
+        JSON.parse(RestClient.post("#{HOST}/#{path}.json?auth_token=#{@token}",params))
+      end
+      
+      def rest_delete(path,params={})
+        params["auth_token"]=@token
+        
+        param_string=params.map{|key,value| "#{key}=#{value}"}.join("&")
+        
+        JSON.parse(RestClient.delete("#{HOST}/#{path}.json?#{param_string}"))
       end
     
     end

data/lib/runtime/engine.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'factor'
 require 'mustache'
+require 'facter'
+require 'siren'
 
 
 module Factor
@@ -73,21 +75,26 @@ module Factor
                 action = activity["action"]
                 channel = activity["channel"]
                 method = activity["method"]
+                target = activity["target"]
               
-                values = message.body.merge(@credentials)
-                puts "[values] #{values}"
-                # this maps the input values passed in with the templated defined in the workflow
-                params = Hash.new
-                activity["params"].each do |key,template|
-                  params[key]=Mustache.render(template,values)
-                end
-                puts "[calling] #{channel}::#{method} (#{params.to_s})"
-                event = call_channel_method(channel,method,params)
+                
+                if match(target)
+              
+                  values = message.body.merge(@credentials)
+                  # puts "[values] #{values}"
+                  # this maps the input values passed in with the templated defined in the workflow
+                  params = Hash.new
+                  activity["params"].each do |key,template|
+                    params[key]=Mustache.render(template,values)
+                  end
+                  # puts "[calling] #{channel}::#{method} (#{params.to_s})"
+                  event = call_channel_method(channel,method,params)
               
-                response_message = message.respond(event.params,event.class.name.split("::").last)
+                  response_message = message.respond(event.params,event.class.name.split("::").last)
               
               
-                @message_bus.send response_message
+                  @message_bus.send response_message
+                end
               
               end
             else
@@ -97,12 +104,21 @@ module Factor
         end
       end
 
-
       def call_channel_method(channel_name,class_name,params)
         channel_module = @channel_modules[channel_name]
         command = channel_module.const_get(class_name)
         command.new.do_work(params)
       end
+      
+      private 
+      
+      def match(target)
+        return true if target==nil || target==""
+        [key,value]=target.split("=")
+        Facter[key]==value
+      end
+      
+      
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factor
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -123,6 +123,54 @@ 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: siren
+  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'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Friendly command-line interface and library for Factor
 email: maciej@skierkowski.com
 executables: