gyunyu 0.3.1 → 0.3.2

data/Rakefile

@@ -31,9 +31,11 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:simplecov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+namespace :spec do
+  desc 'Run Rspec & Create Coverage'
+  RSpec::Core::RakeTask.new(:coverage) do
+    ENV['COVERAGE'] = "true"
+  end
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/gyunyu.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gyunyu"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["wtnabe"]
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/gyunyu/command/export/format/json.rb",
     "lib/gyunyu/command/export/format/yaml.rb",
     "lib/gyunyu/command/export/option.rb",
+    "lib/gyunyu/command/export/total_estimate.rb",
     "lib/gyunyu/expander.rb",
     "lib/gyunyu/token.rb",
     "spec/app/.gitkeep",
@@ -43,6 +44,7 @@ Gem::Specification.new do |s|
     "spec/app/command/export/custom_filter_spec.rb",
     "spec/app/command/export/format/csv_spec.rb",
     "spec/app/command/export/option_spec.rb",
+    "spec/app/command/export/total_estimate_spec.rb",
     "spec/app/command_spec.rb",
     "spec/app/expander_spec.rb",
     "spec/spec_helper.rb",

data/lib/gyunyu/command/export/app.rb

@@ -5,6 +5,9 @@ module Gyunyu
     module Export
       class App
         TIME_FIELDS = %w( created modified due added completed deleted )
+        ESTIMATE_DAY  = 'estimate(d)'
+        ESTIMATE_HOUR = 'estimate(h)'
+        ESTIMATE_MIN  = 'estimate(m)'
 
         def initialize
           @argv  ||= ARGV
@@ -21,7 +24,7 @@ module Gyunyu
         def fields
           ['list'] + option.fields.map { |f|
             if f == 'estimate'
-              %w( estimate(d) estimate(h) estimate(m) )
+              [ESTIMATE_DAY, ESTIMATE_HOUR, ESTIMATE_MIN]
             else
               f
             end
@@ -121,9 +124,9 @@ module Gyunyu
                         end
                   if f == 'estimate'
                     e = split_estimate( t[f] )
-                    record['estimate(d)'] = e.day
-                    record['estimate(h)'] = e.hour
-                    record['estimate(m)'] = e.min
+                    record[ESTIMATE_DAY]  = e.day
+                    record[ESTIMATE_HOUR] = e.hour
+                    record[ESTIMATE_MIN]  = e.min
                   else
                     record[f] = val
                   end

data/lib/gyunyu/command/export/format/csv.rb

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../total_estimate'
+
 if RUBY_VERSION < '1.9'
   require 'fastercsv'
 else
@@ -16,7 +18,11 @@ module Gyunyu
           @num_notes = nil
 
           class << self
+            include Export::TotalEstimate
+
             def export( tasks, fields )
+              sum_estimate( tasks, fields )
+
               FasterCSV.generate { |csv|
                 tasks, fields = parse( tasks, fields )
                 csv << fields
@@ -35,6 +41,12 @@ module Gyunyu
                     t[f]
                   }.flatten
                 }
+
+                if @total_estimate
+                  csv << fields.map { |f|
+                    @total_estimate.has_key?(f) ? @total_estimate[f] : ''
+                  }
+                end
               }
             end
 

data/lib/gyunyu/command/export/total_estimate.rb

@@ -0,0 +1,41 @@
+module Gyunyu
+  module Command
+    module Export
+      module TotalEstimate
+        def sum_estimate( tasks, fields )
+          if have_estimate_fields?( fields )
+            sum = {}; estimate_fields.map { |f| sum[f] = 0 }
+
+            tasks.each { |t|
+              fields.grep(/\Aestimate/).each { |f|
+                sum[f] += t[f].to_i
+              }
+            }
+            @total_estimate = moveup_minute( sum )
+          end
+        end
+
+        #
+        # [param]  Hash sum
+        # [return] Hash
+        #
+        def moveup_minute( sum )
+          movedup_hour            =  sum[App::ESTIMATE_MIN] / 60
+          sum[App::ESTIMATE_HOUR] += movedup_hour
+          sum[App::ESTIMATE_MIN]  =  sum[App::ESTIMATE_MIN] - movedup_hour * 60
+          sum
+        end
+
+        def have_estimate_fields?( fields )
+          estimate_fields & fields == estimate_fields
+        end
+
+        def estimate_fields
+          App.constants.map(&:to_s).grep(/\AESTIMATE/).map { |e|
+            App.const_get(e)
+          }
+        end
+      end
+    end
+  end
+end

data/spec/app/command/export/total_estimate_spec.rb

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe Gyunyu::Command::Export::TotalEstimate do
+  include Gyunyu::Command::Export::TotalEstimate
+
+  let(:tasks) {
+    [
+      { "list"        => "個人",
+        "name"        => "gyunyu開発",
+        "estimate(d)" => 0,
+        "estimate(h)" => 2,
+        "estimate(m)" => 45},
+      { "list"        => "家",
+        "name"        => "小さな整理",
+        "estimate(d)" => 0,
+        "estimate(h)" => 0,
+        "estimate(m)" => 25},
+      { "list"        => "個人",
+        "name"        => "ありがちanalyticsコード改善",
+        "estimate(d)" => 0,
+        "estimate(h)" => 0,
+        "estimate(m)" => 60}
+    ]
+  }
+
+  describe 'sum_estimate' do
+    subject {
+      sum_estimate( tasks, %w{list name estimate(d) estimate(h) estimate(m)} )
+    }
+    it {
+      should == {
+        'estimate(d)' => 0,
+        'estimate(h)' => 4,
+        'estimate(m)' => 10
+      }
+    }
+  end
+
+  describe 'have_estimate_fields?' do
+    context 'name, due' do
+      subject {
+        have_estimate_fields?( %w( name due ) )
+      }
+      it {
+        should be_false
+      }
+    end
+    context 'name, estimate' do
+      subject {
+        have_estimate_fields?(%w{ name estimate(d) estimate(h) estimate(m) })
+      }
+      it {
+        should be_true
+      }
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,12 +1,20 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
+
+RSpec.configure do |config|
+  config.mock_with :rr
+end
+
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter 'spec'
+  end
+end
+
 require 'gyunyu'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  config.mock_with :rr
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gyunyu
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -182,6 +182,7 @@ files:
 - lib/gyunyu/command/export/format/json.rb
 - lib/gyunyu/command/export/format/yaml.rb
 - lib/gyunyu/command/export/option.rb
+- lib/gyunyu/command/export/total_estimate.rb
 - lib/gyunyu/expander.rb
 - lib/gyunyu/token.rb
 - spec/app/.gitkeep
@@ -189,6 +190,7 @@ files:
 - spec/app/command/export/custom_filter_spec.rb
 - spec/app/command/export/format/csv_spec.rb
 - spec/app/command/export/option_spec.rb
+- spec/app/command/export/total_estimate_spec.rb
 - spec/app/command_spec.rb
 - spec/app/expander_spec.rb
 - spec/spec_helper.rb
@@ -213,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3332948423612070695
+      hash: 328607615784605612
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: