wloger 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc6571a6d7d733aa2a9489941b1f49e025c4128f
-  data.tar.gz: f6562c4cf030117b1f5289198e3eaa66d7e8a8cc
+  metadata.gz: 171a50a811e6c93ba8564e42459b7a40b5590a2d
+  data.tar.gz: 790ee630ccdd142dd08fd449a02b69ed1ff8d8a9
 SHA512:
-  metadata.gz: feb4265e6ffbfe804613e6320391d29cb15e0e3fe96268d5da62f40ca6fef885b7b8d9d140f95d1a0407f573394132ac48c4ec090ed4a4fed088aca4f5ffbe64
-  data.tar.gz: d53312dad2c9e2e8b8cd87aba89c5312a65fb1cf7a9c1c34c484de044f23cd4e4064389c7e9fff72718ab2010275b4b4d023c99b6efc9b62be54967d3f080b65
+  metadata.gz: c72e27c1ef07b56d5b97889b384fd2fef8133c12e74ccceaf0f704b7009e0a3322b8e709299bbd17da716bc7f7c8586863ac66cab8a1e92fe05ad88b608d630e
+  data.tar.gz: 8df8feeef16154a9424412b5e36b21d86549a0551a25a0c2d6a120bef75d766bb4202bbee1c35d2bbc8c13725aa9d23f4517e6a04326f88c5109774bab07d0e0

data/lib/wloger.rb

@@ -1,5 +1,6 @@
+require 'wloger/base/log_file'
 require 'wloger/command'
-require 'wloger/log_file'
+require 'wloger/interface/search'
 require 'wloger/today_log_file'
 require 'wloger/past_log_file'
 require 'wloger/error'

data/lib/wloger/base/log_file.rb

@@ -0,0 +1,19 @@
+module Wloger
+  module Base
+    # base class for today and past logs
+    class LogFile
+      PARENT_DIR_NAME = File.expand_path('~/Documents').freeze
+      DIR_NAME        = 'work_log'.freeze
+      LOG_DIR_NAME    = "#{PARENT_DIR_NAME}/#{DIR_NAME}".freeze
+      LOG_NAME        = 'log'.freeze
+      LOG_EXTENTION   = 'md'.freeze
+      EDITOR_NAME     = 'vim'.freeze
+
+      def initialize(date)
+        @date = date
+        @log_dir = "#{PARENT_DIR_NAME}/#{DIR_NAME}/#{date.strftime('%Y_%m/%d')}"
+        @log_path = "#{@log_dir}/#{LOG_NAME}.#{LOG_EXTENTION}"
+      end
+    end
+  end
+end

data/lib/wloger/command.rb

@@ -1,5 +1,6 @@
-require 'date'
 require 'thor'
+require 'date'
+require 'find'
 
 module Wloger
   # Command line parse class
@@ -11,14 +12,21 @@ module Wloger
       date = Date.today
       @today_log = Wloger::TodayLogFile.new(date)
       @today_log.edit
+    end
 
+    desc 'search', 'Grep in all log files'
+    def search(key)
+      dates = find_all_log_dates
+      grep_results = get_all_grep_results(dates, key)
+
+      Wloger::Interface::Search.new(grep_results)
     end
 
     desc 'version', 'Show the version of Wloger'
     def version
       puts Wloger::VERSION
     end
-    map %w[-v --version] => :version
+    map %w(-v --version) => :version
 
     desc '[DATE]', 'Open the work-log file assigned DATE'
     def method_missing(method)
@@ -31,5 +39,28 @@ module Wloger
       @past_log = Wloger::PastLogFile.new(date)
       @past_log.view
     end
+
+    private
+
+    def find_all_log_dates
+      results = []
+      regexp = /\d{4}_\d{2}\/\d{2}/
+      Find.find(Wloger::Base::LogFile::LOG_DIR_NAME) do |f|
+        next unless f =~ /#{regexp}\/log\.md/
+        date = Date.parse(f[regexp])
+        results << date
+      end
+      results
+    end
+
+    def get_all_grep_results(dates, key)
+      results = []
+      dates.each do |d|
+        log = Wloger::PastLogFile.new(d)
+        grep_result = log.grep(key)
+        results += grep_result unless grep_result.empty?
+      end
+      results
+    end
   end
 end

data/lib/wloger/interface/search.rb

@@ -0,0 +1,33 @@
+module Wloger
+  module Interface
+    # command line user interface for search function class
+    class Search
+      def initialize(results)
+        @results = results
+        output_results
+        interact_with_user
+      end
+
+      private
+
+      def output_results
+        digit = @results.count.to_s.length
+        @results.each_with_index do |r, i|
+          puts "{#{i.to_s.rjust(digit, '0')}}[#{r[0]}]:#{r[1]}"
+        end
+      end
+
+      def interact_with_user
+        print "\nPlease input a number of log file to open[q]: "
+        assign = input_parse(STDIN.gets.chomp)
+
+        Wloger::PastLogFile.new(@results[assign][0]).view
+      end
+
+      def input_parse(str)
+        exit if str == 'q'
+        str.to_i
+      end
+    end
+  end
+end

data/lib/wloger/past_log_file.rb

@@ -1,10 +1,15 @@
 module Wloger
   # past log file class
   ## In case, this class operate today log file.
-  class PastLogFile < LogFile
+  class PastLogFile < Base::LogFile
     def view
       Wloger::Error.no_log_file(@date) unless File.exist?(@log_path)
       system("#{EDITOR_NAME} #{@log_path}")
     end
+
+    def grep(key)
+      array = File.readlines(@log_path).grep(/#{key}/)
+      [@date].product(array)
+    end
   end
 end

data/lib/wloger/today_log_file.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 module Wloger
   # today log file class
   ## If don't exist today dir, this class make the dir.
-  class TodayLogFile < LogFile
+  class TodayLogFile < Base::LogFile
     def edit
       make_dir unless File.exist?(@log_dir)
       system("#{EDITOR_NAME} #{@log_path}")

data/lib/wloger/version.rb

@@ -1,3 +1,3 @@
 module Wloger
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: wloger
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - huyu398
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Wloger manages the directory control of work-logs and automatically select
@@ -89,8 +89,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -98,9 +98,10 @@ files:
 - Rakefile
 - bin/wloger
 - lib/wloger.rb
+- lib/wloger/base/log_file.rb
 - lib/wloger/command.rb
 - lib/wloger/error.rb
-- lib/wloger/log_file.rb
+- lib/wloger/interface/search.rb
 - lib/wloger/past_log_file.rb
 - lib/wloger/today_log_file.rb
 - lib/wloger/version.rb
@@ -118,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Wloger help to manage your daily work-logs.
@@ -136,3 +137,4 @@ test_files:
 - spec/lib/wloger/directory_spec.rb
 - spec/lib/wloger_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/wloger/log_file.rb

@@ -1,16 +0,0 @@
-module Wloger
-  # base object for today and past logs
-  class LogFile
-    PARENT_DIR_NAME = File.expand_path('~/Documents').freeze
-    DIR_NAME        = 'work_log'.freeze
-    LOG_NAME        = 'log'.freeze
-    LOG_EXTENTION   = 'md'.freeze
-    EDITOR_NAME     = 'vim'.freeze
-
-    def initialize(date)
-      @date = date
-      @log_dir = "#{PARENT_DIR_NAME}/#{DIR_NAME}/#{date.strftime('%Y_%m/%d')}"
-      @log_path = "#{@log_dir}/#{LOG_NAME}.#{LOG_EXTENTION}"
-    end
-  end
-end