nowhen 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 262bc6df490d8ed92927a393deb279de2a8395c5
-  data.tar.gz: 72836a595e1666bb63cbcc7cb5df3d3ef614d03e
+  metadata.gz: 761211469f9d3ff25f2fbc5f28401fbbaf5440c1
+  data.tar.gz: d749c7dbfdff6598e6da2cb993c84c65ac7d112d
 SHA512:
-  metadata.gz: ecf2431d0070c22050d2ef7142abbff4e5a9777eb62ba2677648d7d594930ee87848faf8faf28b5c5ded48f8d51931e2908022dbd34aabe07a18c94c0f3ccfbe
-  data.tar.gz: 97174fe493e142ce967b3b3164275470ad367e9547bb08510a6c99193eac4e89eebab1b8039c7433edf521310e522d96d9dfba312a306fd27769695564b2bb0b
+  metadata.gz: 3c345022db55ef23c7de1ea869af21e45c719362fba4371cf7676d539b2212d3164e01f549ba1cb8bfc5bed07c21bedf2e1314ecd846d7e4778868e95adf1f06
+  data.tar.gz: 87eec4440b020845f53893e55b6f8b65504cbe56675a94b115226a3a9a927ddd1bd9217425aa82a28a1b665ca3436a1008c4d8e8f57a1c33d70c1dc1d12ffb98

data/History.txt

@@ -0,0 +1,9 @@
+=== 0.0.2 2013-04-29
+
+* upgrade database : now --db_upgrade
+* save logs : now --log
+* when --limit
+
+=== 0.0.1 2013-04-28
+
+* initial release

data/README.md

@@ -13,6 +13,7 @@ Usage
 -----
 
     % now yummy
+    % now -log http://example.com/food
     % when yummy
 
 

data/lib/nowhen/command.rb

@@ -15,6 +15,8 @@ module NoWhen
 
     def self.now(argv)
       parser = ArgsParser.parse argv do
+        arg :log, 'save log'
+        arg :db_upgrade, 'upgrade database'
         arg :version, 'show version', :alias => :v
         arg :help, 'show help', :alias => :h
       end
@@ -22,6 +24,13 @@ module NoWhen
         show_help parser
       elsif parser.has_option? :version
         STDERR.puts "nowhen version #{NoWhen::VERSION}"
+      elsif parser.has_option? :db_upgrade
+        NoWhen::Model.upgrade
+      elsif parser[:log]
+        log = parser.has_param?(:log) ? parser[:log] : parser.argv.join(' ')
+        log = NoWhen::Model::Log.new(:log => log)
+        log.save
+        p log
       elsif !parser.argv.empty?
         what = parser.argv[0].strip
         tag = NoWhen::Model::Tag.new(:what => what)
@@ -34,6 +43,7 @@ module NoWhen
 
     def self.when(argv)
       parser = ArgsParser.parse argv do
+        arg :limit, 'tags count', :default => 40
         arg :version, 'show version', :alias => :v
         arg :help, 'show help', :alias => :h
       end
@@ -42,10 +52,15 @@ module NoWhen
       elsif parser.has_option? :version
         STDERR.puts "nowhen version #{NoWhen::VERSION}"
       else
-        query = parser.argv.empty? ? {} : {:what => parser.argv[0].strip}
+        query = {}
+        query[:what] = parser.argv[0].strip unless parser.argv.empty?
+        query[:limit] = parser[:limit]
         tags = NoWhen::Model::Tag.find query
         tags.each do |tag|
           puts tag
+          tag.logs.each do |log|
+            puts " - #{log.log}"
+          end
         end
       end
     end

data/lib/nowhen/model/log.rb

@@ -0,0 +1,17 @@
+module NoWhen
+  module Model
+    class Log
+      include DataMapper::Resource
+      property :id, Serial
+      timestamps :at
+      property :log, String, :required => true, :length => 0...2048
+
+      def self.find(query={})
+        {:order => [:created_at.asc], :limit => 40}.each do |k,v|
+          query[k] = v unless query.include? k
+        end
+        self.all query
+      end
+    end
+  end
+end

data/lib/nowhen/model/tag.rb

@@ -10,14 +10,19 @@ module NoWhen
       property :longitude, Float
 
       def self.find(query={})
-        {:order => [:created_at.desc], :limit => 40}.each do |k,v|
+        {:order => [:created_at.asc], :limit => 40}.each do |k,v|
           query[k] = v unless query.include? k
         end
-        self.all(query)
+        self.all query
+      end
+
+      def logs(minute=5)
+        rational = Rational(1, 24*60/minute)
+        Log.find :created_at => (self.created_at-rational)..(self.created_at+rational)
       end
 
       def to_s
-        "#{self.created_at.strftime '[%m/%d %a] (%H:%M:%S)'} \"#{self.what}\""
+        "[#{self.what}]\t#{self.created_at.strftime '(%m/%d %a %H:%M:%S)'}"
       end
     end
   end

data/lib/nowhen/model.rb

@@ -1,6 +1,7 @@
 require "data_mapper"
 require "dm-sqlite-adapter"
 require "nowhen/model/tag"
+require "nowhen/model/log"
 require "fileutils"
 
 module NoWhen
@@ -17,6 +18,11 @@ module NoWhen
       require 'dm-migrations'
       DataMapper.auto_migrate!
     end
+
+    def self.upgrade
+      require 'dm-migrations'
+      DataMapper.auto_upgrade!
+    end
   end
 end
 

data/lib/nowhen/version.rb

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

data/lib/nowhen.rb

@@ -1,4 +1,6 @@
 require "nowhen/version"
+require "date"
+require "backports"
 require "nowhen/model"
 
 module NoWhen

data/nowhen.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "args_parser"
   spec.add_dependency "data_mapper"
   spec.add_dependency "dm-sqlite-adapter"
+  spec.add_dependency "backports"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nowhen
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Sho Hashimoto
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: backports
+  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: Tagger for Life Log
 email:
 - hashimoto@shokai.org
@@ -91,6 +105,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- History.txt
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -99,6 +114,7 @@ files:
 - lib/nowhen.rb
 - lib/nowhen/command.rb
 - lib/nowhen/model.rb
+- lib/nowhen/model/log.rb
 - lib/nowhen/model/tag.rb
 - lib/nowhen/version.rb
 - nowhen.gemspec