gyunyu 0.3.0 → 0.3.1

data/Gemfile

@@ -17,10 +17,10 @@ if RUBY_VERSION < '1.9'
 end
 
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
+  gem "rspec", "> 2"
+  gem "bundler"
+  gem "jeweler"
   gem "yard"
-  gem "rcov", ">= 0"
+  gem "simplecov"
   gem 'rr'
 end

data/README.rdoc

@@ -1,10 +1,10 @@
 = gyunyu
 
-simple RTM app for CLI made with Ruby
+Simple RTM app for CLI made with Ruby
 
 == Required
 
-* Ruby ( tested with Ruby 1.9.2 )
+* Ruby ( tested with CRuby 1.9.2 )
 * read permission of RTM API
 
 == Install
@@ -17,6 +17,8 @@ simple RTM app for CLI made with Ruby
  Usage: gyunyu [options]
      -l, --list LIST
      -f, --filter FILTER
+     -c, --custom-filter FILTER
+     -s, --custom-filter-list
      -d, --field FIELD
      -o, --format FORMAT
  $ gyunyu -f 'dueWithin:"1 week"'
@@ -61,7 +63,6 @@ same above
 
 == Not Supported
 
-* Tags and notes for csv exporting ( dumped as YAML inline format )
 * Convert Date to (ISO 8601 + UTC) in search filter. Currently search results are out of alignment.
 * Default filter
 

data/Rakefile

@@ -31,7 +31,7 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
+RSpec::Core::RakeTask.new(:simplecov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/gyunyu.gemspec

@@ -4,15 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{gyunyu}
-  s.version = "0.3.0"
+  s.name = "gyunyu"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{wtnabe}]
-  s.date = %q{2012-01-08}
-  s.description = %q{now available export command}
-  s.email = %q{wtnabe@gmail.com}
-  s.executables = [%q{gyunyu}]
+  s.authors = ["wtnabe"]
+  s.date = "2012-09-29"
+  s.description = "now available export command"
+  s.email = "wtnabe@gmail.com"
+  s.executables = ["gyunyu"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -46,17 +46,18 @@ Gem::Specification.new do |s|
     "spec/app/command_spec.rb",
     "spec/app/expander_spec.rb",
     "spec/spec_helper.rb",
+    "spec/support/app_export.rb",
     "spec/support/task_raw_data.rb",
     "spec/token/token_spec.rb",
     "tasks/git.rake",
     "tasks/spec.rake",
     "tmp/.gitkeep"
   ]
-  s.homepage = %q{http://github.com/wtnabe/gyunyu}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Simple RTM app for CLI}
+  s.homepage = "http://github.com/wtnabe/gyunyu"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Simple RTM app for CLI"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -65,32 +66,32 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rtmilk>, [">= 0"])
       s.add_runtime_dependency(%q<xml-simple>, [">= 0"])
       s.add_runtime_dependency(%q<rtm-time>, [">= 0.2.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rspec>, ["> 2"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rr>, [">= 0"])
     else
       s.add_dependency(%q<rtmilk>, [">= 0"])
       s.add_dependency(%q<xml-simple>, [">= 0"])
       s.add_dependency(%q<rtm-time>, [">= 0.2.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rspec>, ["> 2"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rr>, [">= 0"])
     end
   else
     s.add_dependency(%q<rtmilk>, [">= 0"])
     s.add_dependency(%q<xml-simple>, [">= 0"])
     s.add_dependency(%q<rtm-time>, [">= 0.2.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rspec>, ["> 2"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rr>, [">= 0"])
   end
 end

data/lib/gyunyu.rb

@@ -1,6 +1,8 @@
 require 'rtmilk'
 require 'rtm-time'
 
+Version = open(File.dirname(__FILE__) + '/../VERSION').read
+
 module Gyunyu
 end
 

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

@@ -9,8 +9,8 @@ module Gyunyu
         def initialize
           @argv  ||= ARGV
           @token ||= Gyunyu::Token.get
-          @lists ||= RTM::List.alive_all
 
+          _init_lists
           _init_option( @argv )
         end
         attr_reader :option, :token, :lists
@@ -36,6 +36,13 @@ module Gyunyu
           Format.const_get(format)
         end
 
+        #
+        # [return] Array
+        #
+        def _init_lists
+          @lists ||= RTM::List.alive_all
+        end
+
         #
         # [param] Array argv
         # [return] Option

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

@@ -11,6 +11,7 @@ module Gyunyu
     module Export
       module Format
         module Csv
+          @tags      = []
           @num_tags  = nil
           @num_notes = nil
 
@@ -23,7 +24,9 @@ module Gyunyu
                 tasks.each { |t|
                   csv << fields.map { |f|
                     case f
-                    when 'tags', 'notes'
+                    when 'tags'
+                      t[f] = expand_tags( t[f] )
+                    when 'notes'
                       num = instance_variable_get( "@num_#{f}" )
                       while t[f].size < num
                         t[f] += ['']
@@ -56,9 +59,8 @@ module Gyunyu
                      else
                        []
                      end
-              if !@num_tags or tags.size > @num_tags
-                @num_tags = tags.size
-              end
+              update_tags_field( tags )
+
               t['tags'] = tags.sort
 
               t
@@ -80,6 +82,12 @@ module Gyunyu
               t
             end
 
+            def update_tags_field( tags )
+              @tags = (@tags | tags).sort
+
+              @num_tags = @tags.size
+            end
+
             def expand_fields( fields )
               fields.map { |e|
                 case e
@@ -95,6 +103,12 @@ module Gyunyu
                 end
               }.flatten
             end
+
+            def expand_tags( tags )
+              @tags.map { |e|
+                tags.include?(e) ? e : ''
+              }
+            end
           end
         end
       end

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

@@ -2,7 +2,7 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Gyunyu::Command::Export::App do
-  let(:app) { Gyunyu::Command::Export::App.new }
+  let(:app) { app_export }
 
   describe 'build_filter' do
     subject {

data/spec/app/command/export/format/csv_spec.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../../../../spec_helper'
 describe Gyunyu::Command::Export::Format::Csv do
   csv_formatter = Gyunyu::Command::Export::Format::Csv
 
-  let(:app) { Gyunyu::Command::Export::App.new }
+  let(:app) { app_export }
 
   before {
     stub(app).task_list { task_raw_data }
@@ -26,10 +26,10 @@ describe Gyunyu::Command::Export::Format::Csv do
       }
       it {
         should == <<EOD
-list,name,tags,""
-仕事,jsのlintについて,research,writing
-仕事,あの本読む,reading,""
-仕事,この本読む,reading,""
+list,name,tags,"",""
+仕事,jsのlintについて,"",research,writing
+仕事,あの本読む,reading,"",""
+仕事,この本読む,reading,"",""
 EOD
       }
     end

data/spec/app/command_spec.rb

@@ -20,6 +20,12 @@ describe Gyunyu::Command do
   describe 'dispatch' do
     context 'correct command' do
       before {
+        Gyunyu::Command::Export::App.class_eval {
+          def _init_lists
+            @lists = []
+          end
+        }
+
         stub.instance_of(Gyunyu::Command::Export::App).run {
           "`export' dispatched"
         }

data/spec/support/app_export.rb

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+class TestingAppExport < Gyunyu::Command::Export::App
+  def _init_lists
+    @lists = [
+      RTM::List.new({ 'id'   => '1234',
+                      'name' => 'Inbox' }),
+      RTM::List.new({ 'id'   => '2345',
+                      'name' => '個人' }),
+      RTM::List.new({ 'id'   => '3456',
+                      'name' => '勉強' })
+    ]
+  end
+end
+
+def app_export
+  app = TestingAppExport.new
+end

data/tasks/spec.rake

@@ -2,7 +2,7 @@
 
 namespace :spec do
   Dir.glob( File.dirname(__FILE__) + '/../spec/*' ).select { |e|
-    File.directory? e
+    File.directory? e and File.basename( e ) != 'support'
   }.each { |d|
     RSpec::Core::RakeTask.new( File.basename( d ) ) { |spec|
       spec.pattern = "#{d}/**/*.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gyunyu
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rtmilk
-  requirement: &3040340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3040340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &3040040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3040040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rtm-time
-  requirement: &3039770 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,43 +53,63 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *3039770
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &3039510 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2'
   type: :development
   prerelease: false
-  version_requirements: *3039510
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &3039210 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3039210
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &3038910 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3038910
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &3038620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3038620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &3038350 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3038350
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &3038090 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3038090
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: now available export command
 email: wtnabe@gmail.com
 executables:
@@ -147,6 +192,7 @@ files:
 - spec/app/command_spec.rb
 - spec/app/expander_spec.rb
 - spec/spec_helper.rb
+- spec/support/app_export.rb
 - spec/support/task_raw_data.rb
 - spec/token/token_spec.rb
 - tasks/git.rake
@@ -167,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -22170513
+      hash: 3332948423612070695
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -176,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple RTM app for CLI