octospy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47c3a44346c54c0c69fb51561b692fb4f9216304
-  data.tar.gz: 80c043163646771135069da36e087dc01cab75c7
+  metadata.gz: 5cd0013747a9a0beb2685537dfe99b7afc590887
+  data.tar.gz: ad7d7b31e172f099dfac8a0167db0568502e4506
 SHA512:
-  metadata.gz: d19a444802e932594a9513605314cd665bc85274f12d9a22a5892d9902cb327ee8279979e28f0ef79f3bd468b3b7818069438bea923c20bac07533da16a6ef0d
-  data.tar.gz: 25694444c3dd360c39f1fa2549ca27795da1aaff97704b556502b04c2c4784f4bcf3fe4820cd962441a1f01dc150628086fde0f7996b8986bcb1d19d5d7b9ff5
+  metadata.gz: 1acb8dcef9fafe09dce81b7104366a066a1c1f994522336833f3938e5adf4c40d855d1849ca6b614944453e5d301a1872cced2148049d8ee805681203e7da3ec
+  data.tar.gz: 51b3b6dc3f079ac109471235edea04206f4508b9f84ffe29455486c8caeb154ad7c5de256a0c112ddcc87d529e47ee9e22ac8e1bdd5aff8e50b51c5314f99fa1

data/.env.example

@@ -0,0 +1,4 @@
+SERVER=irc.yourserver.net
+CHANNELS=yourchannel
+GITHUB_LOGIN=yourusername
+GITHUB_TOKEN=e17e1c6caa3e452433ab55****************

data/.rspec

@@ -1 +1,2 @@
 --color
+--format progress

data/README.md

@@ -13,30 +13,81 @@ Octospy
 [codeclimate]: https://codeclimate.com/github/linyows/octospy
 [coveralls]: https://coveralls.io/r/linyows/octospy
 
-Octospy notifies the repository activity to an IRC channel.
+Octospy notifies the repository activity to some IRC channels.
 
+<div align="center">
 <img src="http://octodex.github.com/images/daftpunktocat-thomas.gif" width="300">
 <img src="http://octodex.github.com/images/daftpunktocat-guy.gif" width="300">
+</div>
 
 Installation
 ------------
 
 Add this line to your application's Gemfile:
 
-    gem 'octospy'
+```ruby
+gem 'octospy'
+```
 
 And then execute:
 
-    $ bundle
+```sh
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install octospy
+```sh
+$ gem install octospy
+```
 
 Usage
 -----
 
-TODO: Write usage instructions here
+```sh
+$ cp .emv.example .env
+```
+
+edit `.env`:
+
+```sh
+SERVER=irc.yourserver.net
+CHANNELS=yourchannel
+GITHUB_LOGIN=yourusername
+GITHUB_TOKEN=e17e1c6caa3e452433ab55****************
+```
+
+github tokens: https://github.com/settings/applications
+
+```sh
+$ octospy
+```
+
+### GitHub Enterprise
+
+add to `.env`
+
+```sh
+GITHUB_API_ENDPOINT=http://your.enterprise.domain/api/v3
+GITHUB_WEB_ENDPOINT=http://your.enterprise.domain
+```
+
+Commands
+--------
+
+format: `octospy: <command>`
+
+Command                          | Description
+-------                          | -----------
+`watch <repository>`             | add repository to watch list (ex: watch rails/rails)
+`unwatch <repository>`           | remove repository to watch list
+`watch <user or organization>`   | add user's repositories to watch list (ex: watch dotcloud)
+`unwatch <user or organization>` | remove user's repositories to watch list
+`job start`                      | start the repository event monitoring
+`job stop`                       | stop the repository event monitoring
+`join <channel>`                 | invite octospy to another channel
+`show watched`                   | display the watch list
+`show status`                    | display the joined channels
 
 Contributing
 ------------
@@ -47,12 +98,12 @@ Contributing
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-Author
-------
+Authors
+-------
 
 - [linyows](https://github.com/linyows)
 
 License
 -------
 
-MIT
+The MIT License (MIT)

data/lib/cinch/plugins/octospy.rb

@@ -49,7 +49,7 @@ module Cinch
 
       def show_status(m)
         @bot.channels.each.with_index(1) do |channel, i|
-          number = ::Octospy.channel(channel).repos.count
+          number = ::Octospy::Recordable.channel(channel).repos.count
           m.reply "#{"%02d" % i} #{channel}: #{number} repo"
         end
       end

data/lib/cinch/plugins/octospy/job.rb

@@ -49,7 +49,7 @@ module Cinch
         end
 
         def start(m)
-          repos = ::Octospy.channel(m.channel.name).repos
+          repos = ::Octospy::Recordable.channel(m.channel.name).repos
           channel = m.channel
 
           worker = ::Octospy.worker(repos) do |message|

data/lib/cinch/plugins/octospy/recording.rb

@@ -4,10 +4,10 @@ module Cinch
       module Recording
         def self.included(base)
           base.class_eval do
-            match(/watch ([\w\-\.]+)\/([\w\-\.]+)/, method: :watch_repository)
-            match(/unwatch ([\w\-\.]+)\/([\w\-\.]+)/, method: :unwatch_repository)
-            match(/watch ([\w\-\.]+)/, method: :watch_repositories)
-            match(/unwatch ([\w\-\.]+)/, method: :unwatch_repositories)
+            match(/watch ([\w\-\.]+)\/([\w\-\.]+)$/, method: :watch_repository)
+            match(/unwatch ([\w\-\.]+)\/([\w\-\.]+)$/, method: :unwatch_repository)
+            match(/watch ([\w\-\.]+)$/, method: :watch_repositories)
+            match(/unwatch ([\w\-\.]+)$/, method: :unwatch_repositories)
             match(/show watched( repos(itories)?)?/, method: :show_watched_repositories)
           end
         end
@@ -20,8 +20,8 @@ module Cinch
             return
           end
 
-          ::Octospy.add_channel m.channel.name
-          ::Octospy.channel(m.channel.name).add_repo(repo)
+          ::Octospy::Recordable.add_channel m.channel.name
+          ::Octospy::Recordable.channel(m.channel.name).add_repo(repo)
 
           restart(m)
           m.reply "I started to watch the #{repo} events"
@@ -35,10 +35,10 @@ module Cinch
             return
           end
 
-          ::Octospy.add_channel m.channel.name
+          ::Octospy::Recordable.add_channel m.channel.name
           method = "#{'org_' if user.type == 'Organization'}repos".to_sym
           repos = ::Octokit.send(method, owner).map { |repo|
-            ::Octospy.channel(m.channel.name).add_repo(repo.full_name)
+            ::Octospy::Recordable.channel(m.channel.name).add_repo(repo.full_name)
             repo.full_name
           }
 
@@ -56,21 +56,21 @@ module Cinch
             return
           end
 
-          ::Octospy.channel(m.channel.name).remove_repo(repo)
+          ::Octospy::Recordable.channel(m.channel.name).remove_repo(repo)
 
           restart(m)
           m.reply "I stopped to watch the #{repo} events"
         end
 
         def unwatch_repositories(m, owner)
-          repos = ::Octospy.channel(m.channel.name).repos.each_with_object([]) do |repo, obj|
+          repos = ::Octospy::Recordable.channel(m.channel.name).repos.each_with_object([]) do |repo, obj|
             next unless repo.split('/').first == owner
-            ::Octospy.channel(m.channel.name).remove_repo(repo)
+            ::Octospy::Recordable.channel(m.channel.name).remove_repo(repo)
             opj << repo
           end
 
           if repos.count > 0
-            if ::Octospy.channel(m.channel.name).repos.count > 0
+            if ::Octospy::Recordable.channel(m.channel.name).repos.count > 0
               m.reply "stopped to watch events of #{repos.count} repositories"
               restart(m)
             else
@@ -84,9 +84,9 @@ module Cinch
         end
 
         def show_watched_repositories(m)
-          channel = ::Octospy.channel(m.channel.name)
+          channel = ::Octospy::Recordable.channel(m.channel.name)
 
-          if channel.nil? || channel.repos.nil? || !channel.repos
+          if channel.nil? || channel.repos.nil? || channel.repos.empty?
             m.reply 'nothing!'
             return
           end

data/lib/octospy.rb

@@ -14,7 +14,6 @@ require 'octospy/octokit/client'
 module Octospy
   class << self
     include Octospy::Configurable
-    include Octospy::Recordable
 
     def parse(event)
       Octospy::Parser.new(event).parse

data/lib/octospy/recordable.rb

@@ -1,25 +1,34 @@
 require 'octospy/recordable/channel'
-require 'octospy/recordable/repo'
 
 module Octospy
   module Recordable
-    def channels
-      @channels ||= {}
-    end
+    class << self
+      def channels
+        @channels ||= []
+      end
 
-    def add_channel(name)
-      @channels.merge!(:"#{name}" => Channel.new(name)) unless channels.has_key?(name.to_sym)
-    end
+      def channels_include?(name)
+        !!find_channel(name)
+      end
 
-    def del_channel(name)
-      @channels.delete(name.to_sym) if channels.has_key?(name)
-    end
+      def find_channel(name)
+        channels.find { |channel| channel.name.to_s == name.to_s }
+      end
+
+      def add_channel(name)
+        channels << Channel.new(name) unless channels_include? name
+      end
+
+      def del_channel(name)
+        channels.delete_if { |channel| channel.name.to_s == name.to_s }
+      end
 
-    def channel(name)
-      if channels.has_key?(name.to_sym)
-        @channels[name.to_sym]
-      else
-        Channel.new(name)
+      def channel(name)
+        if channels_include? name
+          find_channel name
+        else
+          Channel.new(name)
+        end
       end
     end
   end

data/lib/octospy/recordable/channel.rb

@@ -1,8 +1,8 @@
-require 'octospy/recordable/repo'
-
 module Octospy
   module Recordable
     class Channel
+      attr_reader :name
+
       def initialize(name)
         @name = name.to_sym
       end

data/lib/octospy/version.rb

@@ -1,3 +1,3 @@
 module Octospy
-  VERSION = "0.0.1"
+  VERSION = '0.0.2'
 end

data/octospy.gemspec

@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "faraday"
   spec.add_dependency "faraday_middleware"
   spec.add_dependency "dotenv"
+  spec.add_dependency "hashie"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octospy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - linyows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This is IRC bot that notifies repository activity on github.
 email:
 - linyows@gmail.com
@@ -228,6 +242,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.example"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -255,7 +270,6 @@ files:
 - lib/octospy/parser/wiki.rb
 - lib/octospy/recordable.rb
 - lib/octospy/recordable/channel.rb
-- lib/octospy/recordable/repo.rb
 - lib/octospy/shortener.rb
 - lib/octospy/version.rb
 - lib/octospy/worker.rb
@@ -309,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Octospy notifies the repository activity to an IRC channel.

data/lib/octospy/recordable/repo.rb

@@ -1,16 +0,0 @@
-module Octospy
-  module Recordable
-    class Repo
-      attr_accessor :name, :last_event_id
-
-      def initialize(name)
-        @name = name.to_sym
-        @last_event_id = nil
-      end
-
-      def clear!
-        @last_event_id = nil
-      end
-    end
-  end
-end