octospy 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 171af9f29260945a51e4857685b2a65b00db7b92
-  data.tar.gz: d5dd7a84b89cc8c33ddfb04abe4d53961f44a803
+  metadata.gz: 63af8f58921aa9def3c63ad00920328b2607aaa5
+  data.tar.gz: 9224ac7f173e40eec05358677634329f17de2165
 SHA512:
-  metadata.gz: e4a31851c6ad95d9a156d4f26251cd2ace5cae3b0c9802288c0ba8f61e4d5af83358aedb7365f2c027b6d55e4c4dfa89024204f7f6b4aae52ce13843a4caa246
-  data.tar.gz: 95730ccabff662481843d9c2c5a307ae55e9a3943e4ce7032e68ec41ce9b8a5692cd8b25e10fda8cbf732e8f98aabeeaacb5bc7b8ca54cfe467444bd9c631523
+  metadata.gz: 6a0cb773971236457df2b51e3e930e5f30984228617593c16249e0904be7e1f78eea7fc391ecb7d5dc29bfde64867f56def3ddf39e3655688f43f96c875f61b7
+  data.tar.gz: 50269fe88cd999c5d606e7af844650eea65781ab2f27cdd3b771f45cc69d20ea755eb09c93cb46ddce55833ccc646e34366a82247958c51f8b096f738a9a86ed

data/.env.example

@@ -1,17 +1,25 @@
-## Required
+## IRC
 SERVER=irc.yourserver.net
 CHANNELS=yourchannel
-# OAuth access token
-GITHUB_TOKEN=e17e1c6caa3e452433ab55****************
-# Basic Authentication
-# GITHUB_LOGIN=yourusername
-# GITHUB_PASSWORD=************
-
-## Options
 # HOST=6668
 # SSL=true
 # PASSWORD=*****************
 
+## GitHub Authentication
+GITHUB_TOKEN=e17e1c6caa3e452433ab55****************
+# GITHUB_LOGIN=yourusername
+# GITHUB_PASSWORD=************
+
 ## GitHub Enterprise
 # GITHUB_API_ENDPOINT=http://your.enterprise.domain/api/v3
 # GITHUB_WEB_ENDPOINT=http://your.enterprise.domain
+
+## Intervals
+# API_REQUEST_INTERVAL=0
+# WORKER_INTERVAL=15
+
+## DAEMONIZE
+# DAEMONIZE=true
+# PID_FILE=/tmp/octospy.pid
+# LOG_FILE=/tmp/octospy.log
+# SYNC_LOG=false

data/lib/octospy.rb

@@ -46,7 +46,18 @@ module Octospy
       end
     end
 
+    def daemonize
+      Process.daemon(nochdir: nil, noclose: true)
+      File.open(Octospy.pid_file, 'w') { |f| f << Process.pid }
+      log = File.new(Octospy.log_file, 'a')
+      log.sync = Octospy.sync_log
+      STDIN.reopen '/dev/null'
+      STDOUT.reopen log
+      STDERR.reopen STDOUT
+    end
+
     def run
+      self.daemonize if Octospy.daemonize
       self.irc_bot.start
     end
   end

data/lib/octospy/configurable.rb

@@ -8,6 +8,10 @@ module Octospy
         password
         nick
         debug
+        daemonize
+        sync_log
+        pid_file
+        log_file
         worker_interval
         api_request_interval
         cinch_config_block
@@ -47,16 +51,30 @@ module Octospy
       @port                 = ENV['PORT']
       @ssl                  = !!ENV['SSL']
       @debug                = !!ENV['DEBUG']
+      @daemonize            = !!ENV['DAEMONIZE']
+      @sync_log             = "#{ENV['SYNC_LOG'] || true}".to_boolean
+      @pid_file             = ENV['PID_FILE'] || default_pid_file
+      @log_file             = ENV['LOG_FILE'] || default_log_file
       @password             = ENV['PASSWORD']
-      @worker_interval      = ENV['WORKER_INTERVAL'] ? ENV['WORKER_INTERVAL'].to_i : 30 #sec
       # you can make up to 20 requests per minute.
       # http://developer.github.com/v3/search/#rate-limit
-      @api_request_interval = ENV['API_REQUEST_INTERVAL'] ? ENV['API_REQUEST_INTERVAL'].to_i : 3 #sec
+      @api_request_interval = "#{ENV['API_REQUEST_INTERVAL'] || 3}".to_i
+      @worker_interval      = "#{ENV['WORKER_INTERVAL'] || 30}".to_i
       @github_login         = ENV['GITHUB_LOGIN']
       @github_token         = ENV['GITHUB_TOKEN']
       @channels             = ENV['CHANNELS'] ? ENV['CHANNELS'].gsub(/\s|#/, '').split(',').
         map { |ch| "##{ch}" } : nil
       @cinch_config_block   = nil
     end
+
+    private
+
+    def default_pid_file
+      File.join(File.expand_path('../../../tmp/pids', __FILE__), "#{@nick}")
+    end
+
+    def default_log_file
+      File.join(File.expand_path('../../../log', __FILE__), "#{@nick}.log")
+    end
   end
 end

data/lib/octospy/extensions/string.rb

@@ -25,6 +25,13 @@ module Octospy
         StringIrc.new(self)
       end
 
+      def to_boolean
+        case self
+        when 'true' then true
+        when 'false' then false
+        end
+      end
+
       def shorten_url
         Octospy::Url.shorten self
       end

data/lib/octospy/parser.rb

@@ -47,7 +47,7 @@ module Octospy
     end
 
     def build(hash)
-      header = "#{hash[:nick].colorize_for_irc.bold} #{colorize_to hash[:status]}"
+      header = "#{hash[:nick].to_s.colorize_for_irc.bold} #{colorize_to hash[:status]}"
 
       if hash[:repository] && !hash[:repository].empty?
         header = "(#{hash[:repository]}) #{header}"
@@ -58,7 +58,7 @@ module Octospy
       end
 
       if hash[:link] && !hash[:link].empty?
-        header = "#{header} - #{hash[:link].shorten.colorize_for_irc.blue}"
+        header = "#{header} - #{hash[:link].shorten.to_s.colorize_for_irc.blue}"
       end
 
       body = if hash[:body].length > 20
@@ -113,7 +113,7 @@ module Octospy
     end
 
     def colorize_to(string)
-      string.colorize_for_irc.send(behavior_color string).to_s
+      string.to_s.colorize_for_irc.send(behavior_color string).to_s
     end
   end
 end

data/lib/octospy/parser/repository.rb

@@ -20,8 +20,8 @@ module Octospy
           verbose_commit = Octokit.commit(@event.repo.name, commit.sha)
           name = "#{verbose_commit.author ? verbose_commit.author.login : commit.author.name}"
           link = "#{Octokit.web_endpoint}#{@event.repo.name}/commit/#{commit.sha}"
-          line = "#{name.colorize_for_irc.silver}: #{commit.message}"
-          line << " - #{link.shorten.colorize_for_irc.blue}"
+          line = "#{name.to_s.colorize_for_irc.silver}: #{commit.message}"
+          line << " - #{link.shorten.to_s.colorize_for_irc.blue}"
           body = body + "#{line}".split_lfbl
         end
 

data/lib/octospy/parser/wiki.rb

@@ -5,8 +5,8 @@ module Octospy
         action = @event.payload.pages[0].action
         title = @event.payload.pages[0].title
         sha = @event.payload.pages[0].sha[0,6]
-        url = @event.payload.pages[0].html_url
-        url = "#{url}/_compare/#{sha}%5E...#{sha}" if action == 'edited'
+        url = "#{Octokit.web_endpoint}#{@event.repo.name}/wiki"
+        url += "/#{title}/_compare/#{sha}" if action == 'edited'
 
         {
           status: "#{action} the #{@event.repo.name} wiki",

data/lib/octospy/version.rb

@@ -1,3 +1,3 @@
 module Octospy
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/octospy/worker.rb

@@ -36,7 +36,7 @@ module Octospy
 
     def api_requestable?
       limit = Octokit.rate_limit
-      if limit.remaining.zero?
+      if !limit.limit.zero? && limit.remaining.zero?
         notify "ヾ(;´Д`)ﾉ #{limit}"
         false
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octospy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - linyows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,6 +148,7 @@ files:
 - lib/octospy/url.rb
 - lib/octospy/version.rb
 - lib/octospy/worker.rb
+- log/.gitkeep
 - octospy.gemspec
 - spec/fixtures/commit_comment_event.json
 - spec/fixtures/create_event.json