cline 0.2.2 → 0.2.3

data/README.md

@@ -1,5 +1,26 @@
 # Cline - CLI Line Notifier
 
+## **Important** Data schema has changed on version 0.2.3
+
+Please try following commands:
+
+In shell:
+
+~~~~
+  $ sqlite3 ~/.cline/cline.sqlite3
+~~~~
+
+In sqlite3 prompt:
+~~~~
+  BEGIN TRANSACTION;
+  CREATE TABLE "tmp_notifications" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "message" text DEFAULT '' NOT NULL, "display_count" integer DEFAULT 0 NOT NULL, "notified_at" datetime NOT NULL);
+  INSERT INTO tmp_notifications SELECT id, message, display_count, time as notified_at FROM notifications;
+  DROP TABLE notifications;
+  ALTER TABLE tmp_notifications RENAME TO notifications;
+  COMMIT;
+  .q
+~~~~
+
 ## Installation
 
 ~~~~
@@ -7,6 +28,7 @@
   cline init
   echo "Cline.out_stream = Cline::OutStreams::WithGrowl.new($stdout)" > ~/.cline/config # growlnotify required
   echo "Cline.collectors  << Cline::Collector::Feed" >> ~/.cline/config
+  echo "Cline.pool_size   << 2000" >> ~/.cline/config
   curl http://foo.examle.com/url/to/opml.xml > ~/.cline/feeds.xml
 
   cline collect
@@ -47,7 +69,7 @@ example:
   class MyCollector
     def self.collect
       new.sources.each do |source|
-        Cline::Notification.find_by_message(source.body) || Cline::Notification.create!(message: source.body, time: source.created_at)
+        Cline::Notification.find_by_message(source.body) || Cline::Notification.create!(message: source.body, notified_at: source.created_at)
       end
     end
 

data/cline.gemspec

@@ -21,6 +21,25 @@ Gem::Specification.new do |s|
     * `search` command is available.
       usage:
         $ cline search [keyword]
+
+    * Garbage collector is available.
+      Garbage collector will work after `cline collect`.
+      It requires Cline.pool_size.
+
+      example:
+        $ echo "Cline.pool_size = 2000" >> ~/.cline/config
+
+    * Data schema has changed!
+      Please try following commands:
+
+      $ sqlite3 ~/.cline/cline.sqlite3
+      > BEGIN TRANSACTION;
+      > CREATE TABLE "tmp_notifications" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "message" text DEFAULT '' NOT NULL, "display_count" integer DEFAULT 0 NOT NULL, "notified_at" datetime NOT NULL);
+      > INSERT INTO tmp_notifications SELECT id, message, display_count, time as notified_at FROM notifications;
+      > DROP TABLE notifications;
+      > ALTER TABLE tmp_notifications RENAME TO notifications;
+      > COMMIT;
+      > .q
   EOM
 
   #s.rubyforge_project = "cline"

data/lib/cline.rb

@@ -43,6 +43,14 @@ module Cline
       @out_stream = stream
     end
 
+    def pool_size
+      @pool_size
+    end
+
+    def pool_size=(pool_size)
+      @pool_size = pool_size
+    end
+
     collectors = []
     define_method(:collectors) { collectors }
   end

data/lib/cline/collectors.rb

@@ -3,12 +3,12 @@
 module Cline::Collectors
   class Base
     class << self
-      def create_or_pass(message, time)
-        message = message.encode(Encoding::UTF_8)
-        time    = parse_time_string_if_needed(time)
+      def create_or_pass(message, notified_at)
+        message     = message.encode(Encoding::UTF_8)
+        notified_at = parse_time_string_if_needed(notified_at)
 
-        Cline::Notification.instance_exec message, time do |message, time|
-          create(message: message, time: time) unless find_by_message_and_time(message, time)
+        Cline::Notification.instance_exec message, notified_at do |message, notified_at|
+          create(message: message, notified_at: notified_at) unless find_by_message_and_notified_at(message, notified_at)
         end
       rescue ActiveRecord::StatementInvalid => e
         puts e.class, e.message

data/lib/cline/collectors/github.rb

@@ -4,8 +4,8 @@ module Cline::Collectors
   class Github < Base
     class << self
       def collect
-        new(login_name).activities.each do |message, time|
-          create_or_pass message, time
+        new(login_name).activities.each do |message, notified_at|
+          create_or_pass message, notified_at
         end
       end
 
@@ -31,8 +31,11 @@ module Cline::Collectors
       events = JSON.parse(@api_url.read)
 
       events.map { |event|
-        [extract_message(event), event['created_at']]
-      }
+        message = extract_message(event)
+        next unless message
+
+        [message, event['created_at']]
+      }.compact
     end
 
     private

data/lib/cline/command.rb

@@ -47,6 +47,8 @@ module Cline
     desc 'collect', 'Collect sources'
     def collect
       Cline.collectors.each &:collect
+
+      clean_obsoletes if Cline.pool_size
     end
 
     desc 'init', 'Init database'
@@ -54,7 +56,7 @@ module Cline
       ActiveRecord::Base.connection.create_table(:notifications) do |t|
         t.text     :message, null: false, default: ''
         t.integer  :display_count, null: false, default: 0
-        t.datetime :time, null: false
+        t.datetime :notified_at, null: false
       end
     end
 
@@ -62,5 +64,11 @@ module Cline
     def version
       say "cline version #{Cline::VERSION}"
     end
+
+    private
+
+    def clean_obsoletes
+      Notification.clean Cline.pool_size
+    end
   end
 end

data/lib/cline/notification.rb

@@ -2,18 +2,20 @@
 
 module Cline
   class Notification < ActiveRecord::Base
-    validate :time, presence: true
+    validate :notified_at, presence: true
     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')
+      where('message like ?', "%#{word}%").order('notified_at DESC, display_count')
     }
 
     scope :earliest, ->(limit = 1, offset = 0) {
-      order('display_count, time').limit(limit).offset(offset)
+      order_by_default_priority_for_display.order('notified_at ASC').limit(limit).offset(offset)
     }
 
+    scope :order_by_default_priority_for_display, order(:display_count)
+
     scope :displayed, where('display_count > 0')
 
     def message=(m)
@@ -28,6 +30,13 @@ module Cline
       def normalize_message(m)
         m.gsub(/[\r\n]/, '')
       end
+
+      def clean(pool_size)
+        order_by_default_priority_for_display.
+          order('notified_at DESC').
+          offset(pool_size).
+          destroy_all
+      end
     end
 
     def display
@@ -37,7 +46,7 @@ module Cline
     end
 
     def display_message
-      "[#{time}][#{display_count}] #{message}"
+      "[#{notified_at}][#{display_count}] #{message}"
     end
   end
 end

data/lib/cline/version.rb

@@ -1,3 +1,3 @@
 module Cline
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/fabricators.rb

@@ -2,5 +2,5 @@
 
 Fabricator(:notification, class_name: Cline::Notification) do
   message { sequence(:message) {|i| "message ##{i}" } }
-  time { Time.now }
+  notified_at { Time.now }
 end

data/spec/lib/notification_spec.rb

@@ -4,9 +4,9 @@ require_relative '../spec_helper'
 
 describe Cline::Notification do
   describe '.ealiest' do
-    let!(:notification1) { Fabricate(:notification, time: 2.days.ago.beginning_of_day, display_count: 3) }
-    let!(:notification2) { Fabricate(:notification, time: 3.days.ago.beginning_of_day, display_count: 3) }
-    let!(:notification3) { Fabricate(:notification, time: 3.days.ago.beginning_of_day, display_count: 2) }
+    let!(:notification1) { Fabricate(:notification, notified_at: 2.days.ago.beginning_of_day, display_count: 3) }
+    let!(:notification2) { Fabricate(:notification, notified_at: 3.days.ago.beginning_of_day, display_count: 3) }
+    let!(:notification3) { Fabricate(:notification, notified_at: 3.days.ago.beginning_of_day, display_count: 2) }
 
     context 'default(limit 1 offset 0)' do
       subject { Cline::Notification.earliest.all }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cline
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000 Z
+date: 2011-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70110337366880 !ruby/object:Gem::Requirement
+  requirement: &70095226423100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70110337366880
+  version_requirements: *70095226423100
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70110337365820 !ruby/object:Gem::Requirement
+  requirement: &70095226422520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70110337365820
+  version_requirements: *70095226422520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70110337364900 !ruby/object:Gem::Requirement
+  requirement: &70095226421980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70110337364900
+  version_requirements: *70095226421980
 - !ruby/object:Gem::Dependency
   name: feedzirra
-  requirement: &70110337364100 !ruby/object:Gem::Requirement
+  requirement: &70095226421500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.31
   type: :runtime
   prerelease: false
-  version_requirements: *70110337364100
+  version_requirements: *70095226421500
 - !ruby/object:Gem::Dependency
   name: notify
-  requirement: &70110337363240 !ruby/object:Gem::Requirement
+  requirement: &70095226421020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70110337363240
+  version_requirements: *70095226421020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70110337361340 !ruby/object:Gem::Requirement
+  requirement: &70095226420540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70110337361340
+  version_requirements: *70095226420540
 - !ruby/object:Gem::Dependency
   name: ir_b
-  requirement: &70110337375580 !ruby/object:Gem::Requirement
+  requirement: &70095226420040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70110337375580
+  version_requirements: *70095226420040
 - !ruby/object:Gem::Dependency
   name: tapp
-  requirement: &70110337371540 !ruby/object:Gem::Requirement
+  requirement: &70095226419520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70110337371540
+  version_requirements: *70095226419520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70110337385460 !ruby/object:Gem::Requirement
+  requirement: &70095226419040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70110337385460
+  version_requirements: *70095226419040
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70110337383800 !ruby/object:Gem::Requirement
+  requirement: &70095226408260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *70110337383800
+  version_requirements: *70095226408260
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &70110337382240 !ruby/object:Gem::Requirement
+  requirement: &70095226407420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70110337382240
+  version_requirements: *70095226407420
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70110337380260 !ruby/object:Gem::Requirement
+  requirement: &70095226406860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 0.0.6
   type: :development
   prerelease: false
-  version_requirements: *70110337380260
+  version_requirements: *70095226406860
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70110337378360 !ruby/object:Gem::Requirement
+  requirement: &70095226406380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70110337378360
+  version_requirements: *70095226406380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70110337393440 !ruby/object:Gem::Requirement
+  requirement: &70095226405880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: 3.1.1
   type: :development
   prerelease: false
-  version_requirements: *70110337393440
+  version_requirements: *70095226405880
 description: Cline - CLI Line Notifier
 email:
 - celluloid.key@gmail.com
@@ -215,7 +215,16 @@ post_install_message: ! "    **Important** Some features were added.\n\n    * Ne
   collector (GitHub News Feed) is available.\n      $ echo \"Cline.collectors << Cline::Collectors::Github\"
   >> ~/.cline/config\n      $ echo \"Cline::Collectors::Github.login_name = 'your_github_login'\"
   >> ~/.cline/config\n\n    * `search` command is available.\n      usage:\n        $
-  cline search [keyword]\n"
+  cline search [keyword]\n\n    * Garbage collector is available.\n      Garbage collector
+  will work after `cline collect`.\n      It requires Cline.pool_size.\n\n      example:\n
+  \       $ echo \"Cline.pool_size = 2000\" >> ~/.cline/config\n\n    * Data schema
+  has changed!\n      Please try following commands:\n\n      $ sqlite3 ~/.cline/cline.sqlite3\n
+  \     > BEGIN TRANSACTION;\n      > CREATE TABLE \"tmp_notifications\" (\"id\" INTEGER
+  PRIMARY KEY AUTOINCREMENT NOT NULL, \"message\" text DEFAULT '' NOT NULL, \"display_count\"
+  integer DEFAULT 0 NOT NULL, \"notified_at\" datetime NOT NULL);\n      > INSERT
+  INTO tmp_notifications SELECT id, message, display_count, time as notified_at FROM
+  notifications;\n      > DROP TABLE notifications;\n      > ALTER TABLE tmp_notifications
+  RENAME TO notifications;\n      > COMMIT;\n      > .q\n"
 rdoc_options: []
 require_paths:
 - lib