fbomb 3.2.0 → 4.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDdhN2U3OGIxYmQ4ZjE5Y2M0MzUxY2RlYjUzOTQxYTMzM2FlMDI3OQ==
-  data.tar.gz: !binary |-
-    NDIwMDkzODk0MWUwMTJlYjFiNzk0YmE1ZGMzZmRmMDQ3MWI3MDczOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YWE2YjY4N2FlZjg3ZGViYWNjY2Q3YmY0NmY4NjIwMDFiNGQwYWI3ZmEyN2Ew
-    NzA5ZmY5Yjk1ZjE1ZWM3MDZhOWM5OWU5ZTA2ZjYwZTQ3OWFkMjQ4ZjEzOGIz
-    NWNjN2RjZGQzZGEyNjgxNDMyM2U4MmYxMWYyZDkwMzYyNTFhNGE=
-  data.tar.gz: !binary |-
-    MzAxZDgyZjIyMzg2NDNlMWQwMjhmYmEzNjc4NGVjNWNmZWI0MjA4NTAxNDUx
-    YzFkMzNmZWNmYzg5ZjM4YWI3YjJkMTg3OGY5NmM2MzI4MWZiN2Y5M2M5OGYx
-    MDlhN2U3MTdiZTI3MjQxZDFmZDk5NmVhZGIyZDU3ODVlMTMxZDI=
+SHA1:
+  metadata.gz: a9e4146c8c4534fc89e357da734af7be8aff1095
+  data.tar.gz: 501d1722d4edfa7a218b37fa8cf13574868ba86a
+SHA512:
+  metadata.gz: 91f6d54b29756545ae4086f21dc480ade4516c2530430b75054775fce880641ee7dbe25d5f633062e1c96d9d8ccd196bc20f44fea31cb9aba534dc10ab75b295
+  data.tar.gz: 20e779789637cdccff56a067e6e680a6bdfd730ed9e85b104e548061ab62687d12b35034ff23fa467e179600c5a4bdf470f2229b0eff2da1cc91083d98a547d6

data/bin/fbomb

@@ -28,13 +28,20 @@ Main {
       - builtin
   __
 
+  daemonizes!
 
   option('--force', '-f')
   option('--state=state', '-s')
 
+##
+#
   def before_run
-    if params[:state].given
-      path = File.expand_path(params[:state].values.first)
+    $cmd = [Util.which_ruby, File.expand_path(__FILE__), *ARGV].join(' ')
+
+    state = (ENV['STATE'] || params[:state].values.first).to_s.strip
+
+    unless state.empty? 
+      path = File.expand_path(state)
       dirname, basename = File.split(path)
 
       if dirname == '/'
@@ -47,12 +54,115 @@ Main {
     end
   end
 
-##
-#
   def run
+    STDOUT.sync = true
+    STDERR.sync = true
+
     load_commands!
     load_flow!
-    run_command! if argv.first =~ %r|^#{ Regexp.escape(FBomb.leader) }| unless argv.empty?
+    drop_fbombs!
+  end
+
+  def drop_fbombs!
+  #
+    at_exit{ @flow.leave }
+
+    # @flow.speak("fbomb (beta) in da house...")
+
+    trap('INT'){ exit }
+
+=begin
+{"event"=>"activity.user", "tags"=>[], "uuid"=>nil, "persist"=>false, "id"=>194342, "flow"=>"c6dbc029-2173-4fb6-a423-32293c373106", "content"=>{"last_activity"=>1399656686378}, "sent"=>1399657205286, "app"=>nil, "attachments"=>[], "user"=>"76002"}
+=end
+
+  #
+    $inactive = true
+    $active_at = Time.now
+
+    @monitor =
+      Thread.new do
+        Thread.current.abort_on_exception = true
+
+        loop do
+          sleep(60)
+
+          if($inactive and ((Time.now - $active_at).abs > 300))
+            Kernel.exec($cmd)
+          end
+        end
+      end
+
+  #
+    loop do
+      logging_errors do
+        @flow.stream do |flow|
+          begin
+            $inactive = false
+            $active_at = Time.now
+
+          #
+            next unless %w[ message comment ].include?(flow[:event])
+
+          #
+            content = flow[:content]
+
+            case content
+              when Hash
+                content = content[:text].to_s
+              else
+                content = content.to_s
+            end
+
+          #
+            tokens = content.scan(%r/[^\s]+/)
+            arg, *args = tokens
+
+          #
+            FBomb::Command.table.each do |key, command|
+              if command.matches?(content)
+                user = @flow.user_for(flow[:user])
+                FBomb::Command.user = user
+                begin
+                  logging_errors do
+                    logger.info("#{ key } =~ #{ content }")
+                    command.call(content)
+                  end
+                ensure
+                  FBomb::Command.user = nil
+                end
+              end
+            end
+
+          #
+            if arg =~ %r|^\s*#{ Regexp.escape(FBomb.leader) }|
+              key = arg.strip
+              command = FBomb::Command.table[key]
+
+              if command
+                user = @flow.user_for(flow[:user])
+                FBomb::Command.user = user
+                begin
+                  logging_errors do
+                    logger.info("#{ key } #{ args.join(' ') }")
+                    command.call(*args)
+                  end
+                ensure
+                  FBomb::Command.user = nil
+                end
+              end
+            else
+              if @flow.yelling?
+                @flow.yell(content)
+              end
+            end
+          ensure
+            $inactive = true
+          end
+       end
+
+        sleep(rand(42))
+      end
+    end
   end
 
   def load_commands!
@@ -152,35 +262,6 @@ Main {
 
 ##
 #
-  mode(:stop) do
-    def run
-      pid = IO.read(File.join(dotdir, 'pid')).to_i
-      10.times do
-        begin
-          Process.kill(-9, pid)
-        rescue
-          nil
-        end
-      end
-    end
-  end
-
-  mode(:pid) do
-    def run
-      pid = IO.read(File.join(dotdir, 'pid')).to_i
-      puts pid
-    rescue
-      nil
-    end
-  end
-
-  mode(:log) do
-    def run
-      log = IO.read(File.join(dotdir, 'log'))
-      exec "tail -F #{ log.inspect }"
-    end
-  end
-
   mode(:speak) do
     option('--tag=tag', '-t')
 
@@ -197,142 +278,11 @@ Main {
     end
   end
 
-  mode(:run) do
-    option('--daemon', '-d')
-
+  mode(:execute) do
     def run
-      $cmd = [Util.which_ruby, File.expand_path(__FILE__), *ARGV].join(' ')
-
-      if params['daemon'].given?
-        Dir.chdir(dotdir)
-
-        lock = File.join(dotdir, 'lock')
-        FileUtils.touch(lock)
-        open(lock, 'a+') do |fd|
-          fd.flock(File::LOCK_EX|File::LOCK_NB) or exit!(42)
-        end
-
-        exit! if fork
-        exit! if fork
-
-        open(File.join(dotdir, 'pid'), 'w'){|fd| fd.write($$)}
-
-        log = File.join(dotdir, 'log')
-        FileUtils.touch(log)
-
-        open(log, 'a+') do |fd|
-          fd.puts "process #{ $$ } started..."
-          STDOUT.reopen(fd)
-          STDERR.reopen(fd)
-        end
-      end
-
       load_commands!
       load_flow!
-      drop_fbombs!
-    end
-
-    def drop_fbombs!
-    #
-      at_exit{ @flow.leave }
-
-      # @flow.speak("fbomb (beta) in da house...")
-
-      trap('INT'){ exit }
-
-=begin
-{"event"=>"activity.user", "tags"=>[], "uuid"=>nil, "persist"=>false, "id"=>194342, "flow"=>"c6dbc029-2173-4fb6-a423-32293c373106", "content"=>{"last_activity"=>1399656686378}, "sent"=>1399657205286, "app"=>nil, "attachments"=>[], "user"=>"76002"}
-=end
-
-    #
-      $inactive = true
-      $active_at = Time.now
-
-      @monitor =
-        Thread.new do
-          Thread.current.abort_on_exception = true
-
-          loop do
-            sleep(60)
-
-            if($inactive and ((Time.now - $active_at).abs > 300))
-              p '$cmd' => $cmd
-              Kernel.exec($cmd)
-            end
-          end
-        end
-
-    #
-      loop do
-        logging_errors do
-          @flow.stream do |flow|
-            begin
-              $inactive = false
-              $active_at = Time.now
-
-            #
-              next unless %w[ message comment ].include?(flow[:event])
-
-            #
-              content = flow[:content]
-
-              case content
-                when Hash
-                  content = content[:text].to_s
-                else
-                  content = content.to_s
-              end
-
-            #
-              tokens = content.scan(%r/[^\s]+/)
-              arg, *args = tokens
-
-            #
-              FBomb::Command.table.each do |key, command|
-                if command.matches?(content)
-                  user = @flow.user_for(flow[:user])
-                  FBomb::Command.user = user
-                  begin
-                    logging_errors do
-                      logger.info("#{ key } =~ #{ content }")
-                      command.call(content)
-                    end
-                  ensure
-                    FBomb::Command.user = nil
-                  end
-                end
-              end
-
-            #
-              if arg =~ %r|^\s*#{ Regexp.escape(FBomb.leader) }|
-                key = arg.strip
-                command = FBomb::Command.table[key]
-
-                if command
-                  user = @flow.user_for(flow[:user])
-                  FBomb::Command.user = user
-                  begin
-                    logging_errors do
-                      logger.info("#{ key } #{ args.join(' ') }")
-                      command.call(*args)
-                    end
-                  ensure
-                    FBomb::Command.user = nil
-                  end
-                end
-              else
-                if @flow.yelling?
-                  @flow.yell(content)
-                end
-              end
-            ensure
-              $inactive = true
-            end
-         end
-
-          sleep(rand(42))
-        end
-      end
+      run_command! if argv.first =~ %r|^#{ Regexp.escape(FBomb.leader) }| unless argv.empty?
     end
   end
 

data/fbomb.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "fbomb"
-  spec.version = "3.2.0"
+  spec.version = "4.0.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "fbomb"
   spec.description = "description: fbomb kicks the ass"
@@ -96,7 +96,7 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["fukung", ">= 1.1.0"])
   
-    spec.add_dependency(*["main", ">= 4.7.6"])
+    spec.add_dependency(*["main", ">= 6.1.0"])
   
     spec.add_dependency(*["nokogiri", ">= 1.5.0"])
   

data/lib/fbomb.rb

@@ -13,7 +13,7 @@
 # libs
 #
   module FBomb
-    Version = '3.2.0' unless defined?(Version)
+    Version = '4.0.0' unless defined?(Version)
 
     def version
       FBomb::Version
@@ -21,19 +21,19 @@
 
     def dependencies
       {
-        'flowdock'        =>  [ 'flowdock'        , '>= 0.4.0'   ]  , 
-        'eventmachine'    =>  [ 'eventmachine'    , '>= 1.0.3'   ]  , 
-        'em-http'         =>  [ 'em-http-request' , '>= 1.1.2'   ]  , 
-        'json'            =>  [ 'json'            , '>= 1.8.1'   ]  , 
-        'coerce'          =>  [ 'coerce'          , '>= 0.0.6'   ]  , 
-        'fukung'          =>  [ 'fukung'          , '>= 1.1.0'   ]  , 
-        'main'            =>  [ 'main'            , '>= 4.7.6'   ]  , 
-        'nokogiri'        =>  [ 'nokogiri'        , '>= 1.5.0'   ]  , 
-        'google-search'   =>  [ 'google-search'   , '>= 1.0.2'   ]  , 
-        'unidecode'       =>  [ 'unidecode'       , '>= 1.0.0'   ]  , 
-        'systemu'         =>  [ 'systemu'         , '>= 2.3.0'   ]  , 
-        'pry'             =>  [ 'pry'             , '>= 0.9.6.2' ]  , 
-        'mechanize'       =>  [ 'mechanize'       , '>= 2.7.3'   ]  , 
+        'flowdock'        =>  [ 'flowdock'        , '>= 0.4.0'   ]  ,
+        'eventmachine'    =>  [ 'eventmachine'    , '>= 1.0.3'   ]  ,
+        'em-http'         =>  [ 'em-http-request' , '>= 1.1.2'   ]  ,
+        'json'            =>  [ 'json'            , '>= 1.8.1'   ]  ,
+        'coerce'          =>  [ 'coerce'          , '>= 0.0.6'   ]  ,
+        'fukung'          =>  [ 'fukung'          , '>= 1.1.0'   ]  ,
+        'main'            =>  [ 'main'            , '>= 6.1.0'   ]  ,
+        'nokogiri'        =>  [ 'nokogiri'        , '>= 1.5.0'   ]  ,
+        'google-search'   =>  [ 'google-search'   , '>= 1.0.2'   ]  ,
+        'unidecode'       =>  [ 'unidecode'       , '>= 1.0.0'   ]  ,
+        'systemu'         =>  [ 'systemu'         , '>= 2.3.0'   ]  ,
+        'pry'             =>  [ 'pry'             , '>= 0.9.6.2' ]  ,
+        'mechanize'       =>  [ 'mechanize'       , '>= 2.7.3'   ]  ,
         'mime/types'      =>  [ 'mime-types'      , '>= 1.16'    ] 
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fbomb
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Ara T. Howard
@@ -14,199 +14,199 @@ dependencies:
   name: flowdock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: coerce
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: fukung
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: main
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.6
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.6
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: google-search
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: unidecode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.6.2
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.3
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
-description: ! 'description: fbomb kicks the ass'
+description: 'description: fbomb kicks the ass'
 email: ara.t.howard@gmail.com
 executables:
 - fbomb
@@ -281,19 +281,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: codeforpeople
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: fbomb
 test_files: []
-has_rdoc: