gina-conveyor 0.2.3 → 0.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b5e7532c41370b5895baf8dc2776eaef2531ce99
+  data.tar.gz: a2c2b104cd9ebbc166bc5d397cc4b0a93d660c13
+SHA512:
+  metadata.gz: 3f310031700a8186a14dce0d7130898d3ada6bdaf0e27ea9db5d1223e654657ae7123d2d612bcf5961f7c8d48bd66ee9206042e0e1b1994a57d3517bc4bce22d
+  data.tar.gz: baacd19e877b28d60c7672b9f08123cadbb48bae2d694ba4b035a775cfd2d300a4e52f1778fb1dce8de6d312d4933bfffc6ab33c04f11b72de35e8592fed6920

data/Gemfile.lock

@@ -1,23 +1,22 @@
 PATH
   remote: .
   specs:
-    gina-conveyor (0.2.1)
+    gina-conveyor (0.2.3)
       activemodel (~> 4.1.0)
       activesupport (~> 4.1.0)
       em-websocket (~> 0.5.1)
       eventmachine (~> 1.0.0)
-      listen (~> 2.7.11)
+      listen (~> 2.10)
       rainbow (~> 2.0.0)
       rb-readline (~> 0.5.0)
-      tinder (= 1.10.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
+    activemodel (4.1.12)
+      activesupport (= 4.1.12)
       builder (~> 3.1)
-    activesupport (4.1.7)
+    activesupport (4.1.12)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -29,47 +28,26 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.0.3)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
-      faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.6)
-    hashie (2.1.2)
+    eventmachine (1.0.7)
+    ffi (1.9.10)
     hitimes (1.2.2)
     http_parser.rb (0.6.0)
-    i18n (0.6.11)
-    json (1.8.1)
-    listen (2.7.11)
-      celluloid (>= 0.15.2)
+    i18n (0.7.0)
+    json (1.8.3)
+    listen (2.10.1)
+      celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    mime-types (2.4.3)
-    minitest (5.4.2)
-    multi_json (1.10.1)
-    multipart-post (2.0.0)
+    minitest (5.7.0)
     rainbow (2.0.0)
     rake (10.3.2)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rb-readline (0.5.1)
-    roauth (0.0.8)
-    thread_safe (0.3.4)
+    rb-readline (0.5.3)
+    thread_safe (0.3.5)
     timers (4.0.1)
       hitimes
-    tinder (1.10.0)
-      eventmachine (~> 1.0)
-      faraday (~> 0.9.0)
-      faraday_middleware (~> 0.9)
-      hashie (>= 1.0, < 3)
-      json (~> 1.8.0)
-      mime-types
-      multi_json (~> 1.7)
-      twitter-stream (~> 0.1)
-    twitter-stream (0.1.12)
-      eventmachine (>= 0.12.8)
-      roauth (>= 0.0.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 

data/conveyor.gemspec

@@ -22,10 +22,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake')
   gem.add_dependency('activemodel', '~> 4.1.0')
   gem.add_dependency('activesupport', '~> 4.1.0')
-  gem.add_dependency('listen', '~> 2.7.11')
+  gem.add_dependency('listen', '~> 2.10')
   gem.add_dependency('rainbow', '~> 2.0.0')
   gem.add_dependency('rb-readline', '~> 0.5.0')
   gem.add_dependency('eventmachine', '~> 1.0.0')
   gem.add_dependency('em-websocket', '~> 0.5.1')
-  gem.add_dependency('tinder', '1.10.0')
 end

data/lib/conveyor/foreman.rb

@@ -22,10 +22,10 @@ module Conveyor
       'Foreman'
     end
 
-    def channel 
+    def channel
       @channel ||= EM::Channel.new
     end
-  
+
     def read_configs
       @config = {
         "worker_defs" => File.expand_path('.workers', Dir.pwd),
@@ -35,15 +35,9 @@ module Conveyor
           "disabled" => false,
           "host" => "0.0.0.0",
           "port" => 9876
-        },
-        "campfire" => {
-          "subdomain" => "",
-          "use_ssl" => true,
-          "token" => "",
-          "room" => ""
         }
       }
-      
+
       @config_file = '.conveyor'
       if File.exists? @config_file
         @config.merge! YAML.load(File.open(@config_file))
@@ -53,7 +47,7 @@ module Conveyor
       else
         write_config(@config)
       end
-      
+
       # New version of conveyor update config file with new params
       if !@config['version'] || @config['version'] != Conveyor::VERSION
         @config['version'] = Conveyor::VERSION
@@ -62,9 +56,8 @@ module Conveyor
 
       @config.symbolize_keys!
       @config[:websocket].symbolize_keys!
-      @config[:campfire].symbolize_keys!
     end
-    
+
     def write_config(config)
       File.open(@config_file, 'w') { |fp| fp << config.to_yaml }
     end
@@ -73,21 +66,21 @@ module Conveyor
       @listener_opts = args.extract_options!
       @listener_dir = File.expand_path(args.first)
       raise "Directory #{@listener_dir} not found" unless File.directory? @listener_dir
-      
+
       @listener_opts[:latency] ||= 1
       # Set a large latency if we force polling, prevents high cpu usage
       @listener_opts[:latency] = 1 if @listener_opts[:latency] < 1 and @listener_opts[:force_polling]
-      
+
       yield
     end
-    
+
     def match(*args, &block)
       opts = args.extract_options!
       debug "Filters: #{args.inspect}"
-      
+
       debug "Force polling" if @listener_opts[:force_polling]
       listener_opts = { latency: @listener_opts[:latency] || 0.5, force_polling: @listener_opts[:force_polling] }
-      
+
       b = @belts[@listener_dir] = Belt.new(@listener_dir, @current_worker)
       callback = lambda do |modified, added, removed|
         begin
@@ -108,11 +101,11 @@ module Conveyor
       error "ERROR: #{e.message}"
       error e.backtrace
     end
-    
+
     def file(glob)
       /#{glob}$/
     end
-    
+
     def extension(glob)
       /\.#{glob}$/
     end
@@ -120,7 +113,7 @@ module Conveyor
     def any
       '*'
     end
-    
+
     def notify_list
       @notify_list.flatten!
       @notify_list.uniq!
@@ -130,12 +123,12 @@ module Conveyor
     def stop!
       @listeners.each { |dir,l| info "Stopping #{dir} listener"; l.stop }
       @listeners = {}
-      @notify_list = []      
+      @notify_list = []
     end
-    
+
     def start
       load!
-      @listeners.each do |k, listener| 
+      @listeners.each do |k, listener|
         info "Watching #{k}"
         listener.start
       end
@@ -151,31 +144,31 @@ module Conveyor
         EM.defer do
           b.check
         end
-      end      
+      end
     end
 
     def load!
       stop!
-      
-      info "Loading workers from #{@config[:worker_defs]}"            
+
+      info "Loading workers from #{@config[:worker_defs]}"
       FileUtils.mkdir_p(@config[:worker_defs])
-      
+
       Dir.glob(File.join(@config[:worker_defs], '*.worker')) do |file|
         begin
           @current_worker = File.expand_path(file)
           instance_eval File.read(@current_worker)
         rescue => e
           error [
-            "Error loading #{@current_worker}, skipping", 
-            e.message, 
+            "Error loading #{@current_worker}, skipping",
+            e.message,
             e.backtrace
           ].flatten
         end
       end
     end
-    
+
     def method_missing(method, value = nil)
       return method.to_s
-    end 
+    end
   end
 end

data/lib/conveyor/output.rb

@@ -2,14 +2,13 @@ require 'conveyor/output/console'
 require 'conveyor/output/email'
 require 'conveyor/output/logfile'
 require 'conveyor/output/channel'
-require 'conveyor/output/campfire'
 
 module Conveyor
   module Output
     MSGLVLS = {
-      :debug    => 1, 
-      :info     => 10, 
-      :warning  => 20, 
+      :debug    => 1,
+      :info     => 10,
+      :warning  => 20,
       :error    => 30,
       :announce => 40
     }
@@ -46,11 +45,11 @@ module Conveyor
     def info(*msg)
       output(:info, *msg)
     end
-    
+
     def warning(*msg)
       output(:warning, *msg)
     end
-    
+
     def error(*msg)
       output(:error, *msg)
     end
@@ -58,20 +57,19 @@ module Conveyor
     def debug(*msg)
       output(:debug, *msg)
     end
-    
+
     def announce(*msg)
       output(:announce, *msg)
     end
-    
+
     def output(msgtype, *msg)
       return false unless should_log?(msgtype)
       Console.write(msgtype, *msg)
       Logfile.write(logfile, name, msgtype, *msg)
-      Email.write(msgtype, *msg) 
+      Email.write(msgtype, *msg)
       Channel.instance.write(name, msgtype, *msg)
-      Campfire.instance.write(name, msgtype, *msg)
     end
-    
+
     def send_notifications
       Email.mail
     end
@@ -80,4 +78,4 @@ module Conveyor
       Conveyor::Foreman.instance.notify_list << emails
     end
   end
-end
+end

data/lib/conveyor/version.rb

@@ -1,3 +1,3 @@
 module Conveyor
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/conveyor.rb

@@ -15,12 +15,11 @@ require 'rb-readline'
 require 'fileutils'
 require 'eventmachine'
 require 'em-websocket'
-require 'tinder'
 require "conveyor/version"
 
 module Conveyor
   extend ActiveSupport::Autoload
-  
+
   autoload :Output,     'conveyor/output'
   autoload :Foreman,    'conveyor/foreman'
   autoload :Belt,       'conveyor/belt'

metadata

@@ -1,160 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: gina-conveyor
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.2.4
 platform: ruby
 authors:
 - Will Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.11
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.11
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
-- !ruby/object:Gem::Dependency
-  name: tinder
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.10.0
 description: Conveyor is used for shuffling data around
 email:
 - will@gina.alaska.edu
@@ -163,7 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -179,7 +146,6 @@ files:
 - lib/conveyor/input/console.rb
 - lib/conveyor/job_state.rb
 - lib/conveyor/output.rb
-- lib/conveyor/output/campfire.rb
 - lib/conveyor/output/channel.rb
 - lib/conveyor/output/console.rb
 - lib/conveyor/output/email.rb
@@ -252,26 +218,25 @@ files:
 - worker-examples/devel.worker
 homepage: http://github.com/gina-alaska/conveyor.git
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: GINA Data Conveyor
 test_files: []

data/lib/conveyor/output/campfire.rb

@@ -1,29 +0,0 @@
-module Conveyor
-  module Output
-    class Campfire
-      include Singleton
-      
-      def initialize
-        @config = Conveyor::Foreman.instance.config[:campfire]
-        @host = Socket.gethostname
-        
-        if enabled?
-          @campfire = Tinder::Campfire.new @config[:subdomain], :token => @config[:token]
-        end
-      end
-      
-      def write(name, msgtype, *msg)
-        return false if !enabled? or msgtype != :announce
-        
-        room = @campfire.find_room_by_name(@config[:room])
-        Array(msg).each do |m|
-          room.speak "[#{@host}::#{name}] #{m}"
-        end
-      end
-      
-      def enabled?
-        !@config[:subdomain].empty? && !@config[:token].empty? && !@config[:room].empty?
-      end
-    end
-  end
-end