cline 0.2.0 → 0.2.1

data/cline.gemspec

@@ -12,18 +12,15 @@ Gem::Specification.new do |s|
   s.description = %q{Cline - CLI Line Notifier}
 
   s.post_install_message = <<-EOM
-    **Important** Some APIs name have changed.
+    **Important** Some features were added.
 
-      s/fetch/collect/g
+    * New collector (GitHub News Feed) is available.
+      $ echo "Cline.collectors << Cline::Collectors::Github" >> ~/.cline/config
+      $ echo "Cline::Collectors::Github.login_name = 'your_github_login'" >> ~/.cline/config
 
-      * Command
-        $ cline fetch
-          => $ cline collect
-
-      * Classes And Modules
-        Cline.fechers   => Cline.collectors
-        Cline::Fetchers => Cline::Collectors
-        Cline::Fetchers::Feed.fetch => Cline::Fetchers::Feed.collect
+    * `search` command is available.
+      usage:
+        $ cline search [keyword]
   EOM
 
   #s.rubyforge_project = "cline"
@@ -41,6 +38,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activerecord', ['>= 3.1.1']
   s.add_runtime_dependency 'sqlite3', ['>= 1.3.4']
   s.add_runtime_dependency 'feedzirra', ['~> 0.0.31'] # FIXME builder dependency workaround...
+  s.add_runtime_dependency 'notify', ['>= 0.3.0']
 
   s.add_development_dependency 'rake', ['>= 0.9.2']
   s.add_development_dependency 'ir_b', ['>= 1.4.0']

data/lib/cline/collectors/feed.rb

@@ -0,0 +1,63 @@
+# coding: utf-8
+
+module Cline::Collectors
+  class Feed < Base
+    class << self
+      def collect
+        new(opml_path.read).entries.each do |entry|
+          message = Cline::Notification.normalize_message("#{entry.title} #{entry.url}").encode(Encoding::UTF_8)
+          create_or_pass message, entry.published
+        end
+      end
+
+      def opml_path
+        opml = Pathname.new("#{Cline.cline_dir}/feeds.xml")
+      end
+    end
+
+    def initialize(opml_str)
+      require 'rexml/document'
+      require 'feedzirra'
+
+      @opml = REXML::Document.new(opml_str)
+      @feeds = parse_opml(@opml.elements['opml/body'])
+    end
+
+    def entries
+      entries = []
+
+      @feeds.map { |feed_url|
+        Thread.fork {
+          begin
+            feed = Feedzirra::Feed.fetch_and_parse(feed_url)
+
+            if feed.is_a?(Feedzirra::FeedUtilities)
+              feed.entries.each { |entry| entries << entry }
+            end
+          rescue
+            puts $!.class, $!.message
+          ensure
+            Thread.pass
+          end
+        }
+      }.map(&:join)
+
+      entries
+    end
+
+    def parse_opml(opml_node)
+      feeds = []
+
+      opml_node.elements.each('outline') do |el|
+        unless el.elements.size.zero?
+          feeds += parse_opml(el) 
+        else
+          url = el.attributes['xmlUrl']
+          feeds << url if url
+        end
+      end
+
+      feeds
+    end
+  end
+end

data/lib/cline/collectors/github.rb

@@ -0,0 +1,139 @@
+# coding: utf-8
+
+module Cline::Collectors
+  class Github < Base
+    class << self
+      def collect
+        new(login_name).activities.each do |message, time|
+          create_or_pass message, time
+        end
+      end
+
+      def login_name=(name)
+        @login_name = name
+      end
+
+      def login_name
+        @login_name
+      end
+    end
+
+    Activity = Struct.new(:type, :actor, :action, :url)
+
+    def initialize(name)
+      require 'open-uri'
+      require 'uri'
+
+      @api_url = URI.parse("https://api.github.com/users/#{name}/received_events")
+    end
+
+    def activities
+      events = JSON.parse(@api_url.read)
+
+      events.map { |event|
+        [extract_message(event), event['created_at']]
+      }
+    end
+
+    private
+
+    def extract_message(event)
+      act = extract_activity(event)
+      return unless act
+
+      event_string = act.type.gsub(/Event/i, '')
+      message      = Cline::Notification.normalize_message("#{event_string}: #{act.actor} #{act.action} #{act.url}")
+      message.encode(Encoding::UTF_8)
+    end
+
+    def extract_activity(event)
+      activity = Activity.new(
+        event['type'],
+        event['actor']['login']
+      )
+
+      apply_method = "apply_for_#{event_name_to_underscore(event['type'])}"
+
+      if respond_to?(apply_method, true)
+        payload  = event['payload']
+        send apply_method, activity, event, payload
+      else
+        return nil
+      end
+    end
+
+    def base_url
+      @base_url ||= URI.parse('https://github.com/')
+    end
+
+    def event_name_to_underscore(str)
+      str.chars.inject([]) {|r, c| # XXX 難しい
+        r << (r.empty? ? c.downcase : (c.match(/[A-Z]/) ? "_#{c.downcase}" : c))
+      }.join
+    end
+
+    def apply_for_commit_comment_event(activity, event, payload)
+      activity.url = payload['comment']['html_url']
+      activity
+    end
+
+    def apply_for_create_event(activity, event, payload)
+      activity.url = base_url + event['repo']['name']
+      activity
+    end
+
+    def apply_for_follow_event(activity, event, payload)
+      activity.url = payload['target']['html_url']
+      activity
+    end
+
+    def apply_for_fork_event(activity, event, payload)
+      activity.url = payload['forkee']['html_url']
+      activity
+    end
+
+    def apply_for_gist_event(activity, event, payload)
+      activity.action = payload['action']
+      activity.url    = payload['gist']['html_url']
+      activity
+    end
+
+    def apply_for_gollum_event(activity, event, payload)
+      page = payload['pages'].first # TODO pages contain some pages information
+      activity.action = page['action']
+      activity.url    = page['html_url']
+      activity
+    end
+
+    def apply_for_issue_comment_event(activity, event, payload)
+      activity.action = payload['action']
+      activity.url    = payload['issue']['html_url']
+      activity
+    end
+
+    alias_method :apply_for_issues_event, :apply_for_issue_comment_event
+
+    def apply_for_member_event(activity, event, payload)
+      activity.action = payload['action']
+      activity.url    = base_url + payload['member']['login']
+      activity
+    end
+
+    def apply_for_pull_request_event(activity, event, payload)
+      activity.action = payload['action']
+      activity.url    = payload['pull_request']['_links']['html']['href']
+      activity
+    end
+
+    def apply_for_push_event(activity, event, payload)
+      activity.url = base_url + event['repo']['name']
+      activity
+    end
+
+    def apply_for_watch_event(activity, event, payload)
+      activity.action = payload['action'] # WatchEvent
+      activity.url    = base_url + event['repo']['name']
+      activity
+    end
+  end
+end

data/lib/cline/collectors.rb

@@ -1,72 +1,16 @@
 # coding: utf-8
 
 module Cline::Collectors
-  class Feed
-    class << self
-      def collect
-        entries = new(opml_path.read).collect
-
-        entries.each do |entry|
-          begin
-            Cline::Notification.instance_exec entry do |entry|
-              message = normalize_message("#{entry.title} #{entry.url}").encode(Encoding::UTF_8)
-
-              find_by_message(message) || create(message: message, time: entry.published)
-            end
-          rescue ActiveRecord::StatementInvalid => e
-            puts e.class, e.message
-          end
-        end
-      end
-
-      def opml_path
-        opml = Pathname.new("#{Cline.cline_dir}/feeds.xml")
-      end
-    end
-
-    def initialize(opml_str)
-      require 'rexml/document'
-      require 'feedzirra'
-
-      @opml = REXML::Document.new(opml_str)
-      @feeds = parse_opml(@opml.elements['opml/body'])
-    end
-
-    def collect
-      entries = []
-
-      @feeds.map { |feed_url|
-        Thread.fork {
-          begin
-            feed = Feedzirra::Feed.fetch_and_parse(feed_url)
-
-            if feed.is_a?(Feedzirra::FeedUtilities)
-              feed.entries.each { |entry| entries << entry }
-            end
-          rescue
-            puts $!.class, $!.message
-          ensure
-            Thread.pass
-          end
-        }
-      }.map(&:join)
-
-      entries
-    end
-
-    def parse_opml(opml_node)
-      feeds = []
-
-      opml_node.elements.each('outline') do |el|
-        unless el.elements.size.zero?
-          feeds += parse_opml(el) 
-        else
-          url = el.attributes['xmlUrl']
-          feeds << url if url
-        end
+  class Base
+    def self.create_or_pass(message, time)
+      Cline::Notification.instance_exec message, time do |message, time|
+        create(message: message, time: time) unless find_by_message_and_time(message, time)
       end
-
-      feeds
+    rescue ActiveRecord::StatementInvalid => e
+      puts e.class, e.message
     end
   end
 end
+
+require 'cline/collectors/feed'
+require 'cline/collectors/github'

data/lib/cline/command.rb

@@ -7,12 +7,13 @@ module Cline
       super
     end
 
-    map '-s' => :show,
-        '-t' => :tick,
-        '-s' => :status,
-        '-c' => :collect,
-        '-i' => :init,
-        '-v' => :version
+    map '-s'  => :show,
+        '-t'  => :tick,
+        '-sr' => :search,
+        '-st' => :status,
+        '-c'  => :collect,
+        '-i'  => :init,
+        '-v'  => :version
 
     desc 'show', 'Show a latest message'
     method_options offset: :integer
@@ -29,6 +30,14 @@ module Cline
       end
     end
 
+    desc 'search', 'Search by query'
+    method_options query: :string
+    def search(keyword = optoins[:query])
+      Notification.by_keyword(keyword).each do |notification|
+        say notification.display_message
+      end
+    end
+
     desc 'status', 'Show status'
     def status
       say "displayed : #{Notification.displayed.count}", :green

data/lib/cline/notification.rb

@@ -6,6 +6,10 @@ module Cline
     validate :message, presence: true, uniqueness: true
     validate :display_count, presence: true, numerically: true
 
+    scope :by_keyword, ->(word) {
+      where('message like ?', "%#{word}%").order('time DESC, display_count')
+    }
+
     scope :earliest, ->(limit = 1, offset = 0) {
       order('display_count, time').limit(limit).offset(offset)
     }

data/lib/cline/out_streams.rb

@@ -1,7 +1,18 @@
 # coding: utf-8
 
+require 'notify'
+
 module Cline::OutStreams
-  class WithGrowl
+  def self.const_missing(name)
+    case name
+    when :WithGrowl
+      WithNotify
+    else
+      super
+    end
+  end
+
+  class WithNotify
     attr_reader:stream
 
     def initialize(stream = $stdout)
@@ -10,7 +21,7 @@ module Cline::OutStreams
 
     def puts(str)
       puts_stream str
-      puts_growlnotify str
+      Notify.notify '', str
     end
 
     private
@@ -18,9 +29,5 @@ module Cline::OutStreams
     def puts_stream(str)
       stream.puts str
     end
-
-    def puts_growlnotify(str)
-      `growlnotify -m '#{str}'`
-    end
   end
 end

data/lib/cline/version.rb

@@ -1,3 +1,3 @@
 module Cline
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/fixtures/github/commit_comment_event.json

@@ -0,0 +1,43 @@
+{
+  "type": "CommitCommentEvent",
+  "public": true,
+  "org": {
+    "gravatar_id": "253768044712357787be0f6a3a53cc66",
+    "id": 639823,
+    "url": "https://api.github.com/orgs/",
+    "login": "travis-ci"
+  },
+  "created_at": "2011-11-12T03:14:21Z",
+  "payload": {
+    "comment": {
+      "position": null,
+      "created_at": "2011-11-12T03:14:21Z",
+      "line": null,
+      "body": "I would connect on start the way we did. You never know when lazy connections will be initialized with autoload & ActiveSupport::Dependencies magic and we need to guarantee that we do it after Unicorn forks.\r\n\r\nAs for the initializer (that only matters if you need amqp connection in tests and Rails console) this will work just as well.",
+      "commit_id": "d57b3e9b83ee8f265e0720e4b9fcda9b79b6c468",
+      "updated_at": "2011-11-12T03:14:21Z",
+      "url": "https://api.github.com/repos/travis-ci/travis-ci/comments/712684",
+      "id": 712684,
+      "path": null,
+      "user": {
+        "avatar_url": "https://secure.gravatar.com/avatar/388dee5b4fb00316282b5f40b8409438?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png",
+        "gravatar_id": "388dee5b4fb00316282b5f40b8409438",
+        "url": "https://api.github.com/users/michaelklishin",
+        "id": 1090,
+        "login": "michaelklishin"
+      },
+      "html_url": "https://github.com/travis-ci/travis-ci/commit/d57b3e9b83#commitcomment-712684"
+    }
+  },
+  "repo": {
+    "id": 1420493,
+    "url": "https://api.github.com/repos/travis-ci/travis-ci",
+    "name": "travis-ci/travis-ci"
+  },
+  "actor": {
+    "gravatar_id": "388dee5b4fb00316282b5f40b8409438",
+    "id": 1090,
+    "url": "https://api.github.com/users/michaelklishin",
+    "login": "michaelklishin"
+  }
+}

data/spec/fixtures/github/create_event.json

@@ -0,0 +1,25 @@
+{
+  "actor": {
+    "gravatar_id": "142f56fa109167d398a312e968485087",
+    "id": 7354,
+    "url": "https://api.github.com/users/jugyo",
+    "login": "jugyo"
+  },
+  "type": "CreateEvent",
+  "public": true,
+  "org": {
+    "url": "https://api.github.com/orgs/"
+  },
+  "payload": {
+    "master_branch": "master",
+    "ref": null,
+    "ref_type": "repository",
+    "description": ""
+  },
+  "repo": {
+    "id": 2754911,
+    "url": "https://api.github.com/repos/jugyo/unicolor",
+    "name": "jugyo/unicolor"
+  },
+  "created_at": "2011-11-11T09:32:04Z"
+}

data/spec/fixtures/github/delete_event.json

@@ -0,0 +1,26 @@
+{
+  "actor": {
+    "gravatar_id": "1a3fec33b61038721fd4e609c1d1a4b7",
+    "id": 257678,
+    "url": "https://api.github.com/users/gabebw",
+    "login": "gabebw"
+  },
+  "type": "DeleteEvent",
+  "public": true,
+  "org": {
+    "gravatar_id": "a95a04df2dae60397c38c9bd04492c53",
+    "id": 6183,
+    "url": "https://api.github.com/orgs/",
+    "login": "thoughtbot"
+  },
+  "repo": {
+    "id": 2144417,
+    "url": "https://api.github.com/repos/thoughtbot/kumade",
+    "name": "thoughtbot/kumade"
+  },
+  "created_at": "2011-11-11T14:00:19Z",
+  "payload": {
+    "ref_type": "branch",
+    "ref": "clean-up-cucumber"
+  }
+}

data/spec/fixtures/github/follow_event.json

@@ -0,0 +1,41 @@
+{
+  "actor": {
+    "gravatar_id": "17f1d633137766d9237c6af71738d091",
+    "id": 653658,
+    "url": "https://api.github.com/users/miural",
+    "login": "miural"
+  },
+  "type": "FollowEvent",
+  "public": false,
+  "org": {
+    "url": "https://api.github.com/orgs/"
+  },
+  "repo": {
+    "url": "https://api.github.com/repos//",
+    "name": "/"
+  },
+  "created_at": "2011-11-11T15:05:55Z",
+  "payload": {
+    "target": {
+      "name": "Hitoshi Amano",
+      "company": "Cybozu Labs, Inc",
+      "avatar_url": "https://secure.gravatar.com/avatar/fd5f685078e05abc24334d86adf20fae?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png",
+      "gravatar_id": "fd5f685078e05abc24334d86adf20fae",
+      "created_at": "2008-05-19T05:08:21Z",
+      "location": "Tokyo, Japan",
+      "blog": "http://d.hatena.ne.jp/amachang/",
+      "public_repos": 8,
+      "followers": 166,
+      "url": "https://api.github.com/users/amachang",
+      "public_gists": 0,
+      "id": 10735,
+      "hireable": false,
+      "type": "User",
+      "bio": null,
+      "login": "amachang",
+      "html_url": "https://github.com/amachang",
+      "following": 14,
+      "email": "seijro@gmail.com"
+    }
+  }
+}

data/spec/fixtures/github/fork_event.json

@@ -0,0 +1,55 @@
+{
+  "actor": {
+    "gravatar_id": "dc03a27ae31ba428c560c00c9128cd75",
+    "id": 290782,
+    "url": "https://api.github.com/users/tricknotes",
+    "login": "tricknotes"
+  },
+  "type": "ForkEvent",
+  "public": true,
+  "org": {
+    "gravatar_id": "61024896f291303615bcd4f7a0dcfb74",
+    "id": 9919,
+    "url": "https://api.github.com/orgs/",
+    "login": "github"
+  },
+  "payload": {
+    "forkee": {
+      "master_branch": null,
+      "name": "gollum",
+      "size": 504,
+      "created_at": "2011-11-11T11:21:48Z",
+      "public": true,
+      "clone_url": "https://github.com/tricknotes/gollum.git",
+      "private": false,
+      "updated_at": "2011-11-11T11:21:48Z",
+      "watchers": 1,
+      "url": "https://api.github.com/repos/tricknotes/gollum",
+      "fork": true,
+      "ssh_url": "git@github.com:tricknotes/gollum.git",
+      "git_url": "git://github.com/tricknotes/gollum.git",
+      "language": "JavaScript",
+      "id": 2755421,
+      "svn_url": "https://svn.github.com/tricknotes/gollum",
+      "pushed_at": "2011-10-28T13:04:54Z",
+      "open_issues": 0,
+      "homepage": "",
+      "description": "A simple, Git-powered wiki with a sweet API and local frontend.",
+      "forks": 0,
+      "html_url": "https://github.com/tricknotes/gollum",
+      "owner": {
+        "avatar_url": "https://secure.gravatar.com/avatar/dc03a27ae31ba428c560c00c9128cd75?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png",
+        "gravatar_id": "dc03a27ae31ba428c560c00c9128cd75",
+        "url": "https://api.github.com/users/tricknotes",
+        "id": 290782,
+        "login": "tricknotes"
+      }
+    }
+  },
+  "repo": {
+    "id": 585285,
+    "url": "https://api.github.com/repos/github/gollum",
+    "name": "github/gollum"
+  },
+  "created_at": "2011-11-11T11:21:52Z"
+}

data/spec/fixtures/github/gist_event.json

@@ -0,0 +1,43 @@
+{
+  "type": "GistEvent",
+  "public": true,
+  "org": {
+    "url": "https://api.github.com/orgs/"
+  },
+  "created_at": "2011-11-12T03:28:05Z",
+  "payload": {
+    "action": "create",
+    "gist": {
+      "created_at": "2011-11-12T03:28:04Z",
+      "comments": 0,
+      "public": true,
+      "git_push_url": "git@gist.github.com:1359990.git",
+      "files": {
+
+      },
+      "updated_at": "2011-11-12T03:28:04Z",
+      "url": "https://api.github.com/gists/1359990",
+      "id": "1359990",
+      "git_pull_url": "git://gist.github.com/1359990.git",
+      "description": "rake tasks for jasmine with guard-livereload",
+      "user": {
+        "gravatar_id": "088b1b43ff5dd64aa0f000da9e9da777",
+        "avatar_url": "https://secure.gravatar.com/avatar/088b1b43ff5dd64aa0f000da9e9da777?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png",
+        "url": "https://api.github.com/users/wtnabe",
+        "id": 18510,
+        "login": "wtnabe"
+      },
+      "html_url": "https://gist.github.com/1359990"
+    }
+  },
+  "repo": {
+    "url": "https://api.github.com/repos//",
+    "name": "/"
+  },
+  "actor": {
+    "gravatar_id": "088b1b43ff5dd64aa0f000da9e9da777",
+    "id": 18510,
+    "url": "https://api.github.com/users/wtnabe",
+    "login": "wtnabe"
+  }
+}

data/spec/fixtures/github/gollum_event.json

@@ -0,0 +1,34 @@
+{
+  "type": "GollumEvent",
+  "public": true,
+  "org": {
+    "gravatar_id": "d41d8cd98f00b204e9800998ecf8427e",
+    "id": 845682,
+    "url": "https://api.github.com/orgs/",
+    "login": "pry"
+  },
+  "created_at": "2011-11-12T02:15:32Z",
+  "payload": {
+    "pages": [
+      {
+        "sha": "2011d7ba43b8c40636bb025ee685e741c3287f8d",
+        "title": "State navigation",
+        "action": "edited",
+        "page_name": "State navigation",
+        "summary": null,
+        "html_url": "https://github.com/pry/pry/wiki/State-navigation"
+      }
+    ]
+  },
+  "repo": {
+    "id": 1145832,
+    "url": "https://api.github.com/repos/pry/pry",
+    "name": "pry/pry"
+  },
+  "actor": {
+    "gravatar_id": "890f7065d081f3a735362b6a1ca74b92",
+    "id": 17518,
+    "url": "https://api.github.com/users/banister",
+    "login": "banister"
+  }
+}