tempo-cli 0.1.6 → 0.2.1

data/test/lib/tempo/models/log_test.rb

@@ -17,11 +17,12 @@ describe Tempo do
     it "inherits the freeze-dry method" do
       log_factory
       frozen = @log_4.freeze_dry
+      binding.pry if @log_4.id != 1
       frozen.must_equal({ :start_time=>Time.new(2014, 01, 02, 07, 15),
                           :id=>1, :message=>"day 2 pet the sheep"})
     end
 
-    it "inherits the same indexing method" do
+    it "inherits the base indexing method" do
       log_factory
       Tempo::Model::MessageLog.index.length.must_equal 6
     end
@@ -33,7 +34,12 @@ describe Tempo do
       Tempo::Model::MessageLog.days_index[:"20140102"].length.must_equal 3
     end
 
-    it "creates a file name to save to" do
+    it "knows which directory to save to" do
+      log_factory
+      Tempo::Model::MessageLog.dir.must_equal "tempo_message_logs"
+    end
+
+    it "knows which file name to save to" do
       log_factory
       date = Time.new(2014,1,1)
       Tempo::Model::MessageLog.file(date).must_equal "20140101.yaml"
@@ -42,25 +48,34 @@ describe Tempo do
     it "grants children the ability to write to a file" do
       log_factory
       test_dir = File.join(ENV['HOME'],'tempo','tempo_message_logs')
-      # FileUtils.rm_r test_dir if File.exists?(test_dir)
+      FileUtils.rm_r test_dir if File.exists?(test_dir)
       Tempo::Model::MessageLog.save_to_file
       test_file_1 = File.join(test_dir, "20140101.yaml")
       test_file_2 = File.join(test_dir, "20140102.yaml")
       contents = eval_file_as_array( test_file_1 )
-      contents.must_equal [ "---", ":start_time: 2014-01-01 07:00:00.000000000 -05:00",
-                            ":id: 1", ":message: day 1 pet the sheep",
-                            "---", ":start_time: 2014-01-01 07:30:00.000000000 -05:00",
-                            ":id: 2", ":message: day 1 drinking coffee, check on the mushrooms",
-                            "---", ":start_time: 2014-01-01 12:30:00.000000000 -05:00",
-                            ":id: 3", ":message: day 1 water the bonsai"]
+      # testing with regex because time zone will be different on different computers,
+      # ex: ":start_time: 2014-01-02 07:15:00.000000000 -05:00"
+      eval = [ /---/, /:start_time: 2014-01-01 07:00:00.000000000/,
+                            /:id: 1/, /:message: day 1 pet the sheep/,
+                            /---/, /:start_time: 2014-01-01 07:30:00.000000000/,
+                            /:id: 2/, /:message: day 1 drinking coffee, check on the mushrooms/,
+                            /---/, /:start_time: 2014-01-01 12:30:00.000000000/,
+                            /:id: 3/, /:message: day 1 water the bonsai/]
+      contents.each_with_index do |c, i|
+        c.must_match eval[i]
+      end
+
       contents = eval_file_as_array( test_file_2 )
-      contents.must_equal [ "---", ":start_time: 2014-01-02 07:15:00.000000000 -05:00",
-                            ":id: 1", ":message: day 2 pet the sheep",
-                            "---", ":start_time: 2014-01-02 07:45:00.000000000 -05:00",
-                            ":id: 2", ":message: day 2 drinking coffee, check on the mushrooms",
-                            "---", ":start_time: 2014-01-02 12:00:00.000000000 -05:00",
-                            ":id: 3", ":message: day 2 water the bonsai"]
-     end
+      eval = [ /---/, /:start_time: 2014-01-02 07:15:00.000000000/,
+                            /:id: 1/, /:message: day 2 pet the sheep/,
+                            /---/, /:start_time: 2014-01-02 07:45:00.000000000/,
+                            /:id: 2/, /:message: day 2 drinking coffee, check on the mushrooms/,
+                            /---/, /:start_time: 2014-01-02 12:00:00.000000000/,
+                            /:id: 3/, /:message: day 2 water the bonsai/]
+      contents.each_with_index do |c, i|
+        c.must_match eval[i]
+      end
+    end
 
     it "grants children ability to read from a file" do
       log_record_factory

data/test/lib/tempo/models/time_record_test.rb

@@ -265,26 +265,36 @@ describe Tempo do
       test_file_1 = File.join(ENV['HOME'],'tempo/tempo_time_records/20140101.yaml')
       test_file_2 = File.join(ENV['HOME'],'tempo/tempo_time_records/20140102.yaml')
       contents = eval_file_as_array( test_file_1 )
-      contents.must_equal [ "---", ":project_title: sheep herding", ":description: day 1 pet the sheep",
-                            ":start_time: 2014-01-01 07:00:00.000000000 -05:00", ":end_time: 2014-01-01 07:30:00.000000000 -05:00",
-                            ":id: 1", ":project: 1", ":tags: []",
-                            "---", ":project_title: horticulture - basement mushrooms", ":description: day 1 drinking coffee, check on the mushrooms",
-                            ":start_time: 2014-01-01 07:30:00.000000000 -05:00", ":end_time: 2014-01-01 17:30:00.000000000 -05:00",
-                            ":id: 2", ":project: 2", ":tags: []",
-                            "---", ":project_title: horticulture - backyard bonsai", ":description: day 1 water the bonsai",
-                            ":start_time: 2014-01-01 17:30:00.000000000 -05:00", ":end_time: 2014-01-01 23:59:00.000000000 -05:00",
-                            ":id: 3", ":project: 3", ":tags:", "- horticulture", "- trees"]
+
+      # testing with regex because time zone will be different on different computers,
+      # ex: ":start_time: 2014-01-02 07:15:00.000000000 -05:00"
+      eval = [ /---/, /:project_title: sheep herding/, /:description: day 1 pet the sheep/,
+                            /:start_time: 2014-01-01 07:00:00.000000000/, /:end_time: 2014-01-01 07:30:00.000000000/,
+                            /:id: 1/, /:project: 1/, /:tags: \[\]/,
+                            /---/, /:project_title: horticulture - basement mushrooms/, /:description: day 1 drinking coffee, check on the mushrooms/,
+                            /:start_time: 2014-01-01 07:30:00.000000000/, /:end_time: 2014-01-01 17:30:00.000000000/,
+                            /:id: 2/, /:project: 2/, /:tags: \[\]/,
+                            /---/, /:project_title: horticulture - backyard bonsai/, /:description: day 1 water the bonsai/,
+                            /:start_time: 2014-01-01 17:30:00.000000000/, /:end_time: 2014-01-01 23:59:00.000000000/,
+                            /:id: 3/, /:project: 3/, /:tags:/, /- horticulture/, /- trees/ ]
+      contents.each_with_index do |c, i|
+        c.must_match eval[i]
+      end
+
       contents = eval_file_as_array( test_file_2 )
-      # TODO: test this one too when stable
-      contents.must_equal ["---", ":project_title: sheep herding", ":description: day 2 pet the sheep",
-                           ":start_time: 2014-01-02 07:15:00.000000000 -05:00", ":end_time: 2014-01-02 07:45:00.000000000 -05:00",
-                           ":id: 1", ":project: 1", ":tags: []",
-                           "---", ":project_title: horticulture - basement mushrooms", ":description: day 2 drinking coffee, check on the mushrooms",
-                           ":start_time: 2014-01-02 07:45:00.000000000 -05:00", ":end_time: 2014-01-02 17:00:00.000000000 -05:00",
-                           ":id: 2", ":project: 2", ":tags: []",
-                           "---", ":project_title: horticulture - backyard bonsai", ":description: day 2 water the bonsai",
-                           ":start_time: 2014-01-02 17:00:00.000000000 -05:00", ":end_time: :running",
-                           ":id: 3", ":project: 3", ":tags: []"]
+      eval = [/---/, /:project_title: sheep herding/, /:description: day 2 pet the sheep/,
+                           /:start_time: 2014-01-02 07:15:00.000000000/, /:end_time: 2014-01-02 07:45:00.000000000/,
+                           /:id: 1/, /:project: 1/, /:tags: \[\]/,
+                           /---/, /:project_title: horticulture - basement mushrooms/, /:description: day 2 drinking coffee, check on the mushrooms/,
+                           /:start_time: 2014-01-02 07:45:00.000000000/, /:end_time: 2014-01-02 17:00:00.000000000/,
+                           /:id: 2/, /:project: 2/, /:tags: \[\]/,
+                           /---/, /:project_title: horticulture - backyard bonsai/, /:description: day 2 water the bonsai/,
+                           /:start_time: 2014-01-02 17:00:00.000000000/, /:end_time: :running/,
+                           /:id: 3/, /:project: 3/, /:tags: \[\]/]
+
+      contents.each_with_index do |c, i|
+        c.must_match eval[i]
+      end
     end
   end
 end

data/test/support/factories.rb

@@ -106,6 +106,11 @@ def project_factory
 end
 
 def log_factory
+
+  # delete all records so they aren't loaded when new logs are created
+  test_dir = File.join(ENV['HOME'],'tempo','tempo_message_logs')
+  FileUtils.rm_r test_dir if File.exists?(test_dir)
+
   Tempo::Model::MessageLog.clear_all
   @log_1 = Tempo::Model::MessageLog.new({ message: "day 1 pet the sheep", start_time: Time.new(2014, 1, 1, 7 ) })
   @log_2 = Tempo::Model::MessageLog.new({ message: "day 1 drinking coffee, check on the mushrooms", start_time: Time.new(2014, 1, 1, 7, 30 ) })

data/test/support/helpers.rb

@@ -1,4 +1,4 @@
-def eval_file_as_array( file )
+def eval_file_as_array(file)
   contents = []
   File.open(file, "r") do |f|
     f.readlines.each do |line|
@@ -13,15 +13,15 @@ def has_attr_reader?(obj, attribute)
 end
 
 def has_attr_writer?(obj, attribute)
-  attribute_writer = ( attribute.to_s + "=" ).to_sym
+  attribute_writer = (attribute.to_s + "=").to_sym
   is_writable = obj.class.instance_methods(false).include?(attribute_writer)
 end
 
-def has_attr_accessor?( obj, attribute)
+def has_attr_accessor?(obj, attribute)
   has_attr_reader?(obj, attribute) && has_attr_writer?(obj, attribute)
 end
 
-def has_attr_read_only?( obj, attribute)
+def has_attr_read_only?(obj, attribute)
   has_attr_reader?(obj, attribute) && !has_attr_writer?(obj, attribute)
 end
 
@@ -30,11 +30,11 @@ def inherits_attr_reader?(obj, attribute)
 end
 
 def inherits_attr_writer?(obj, attribute)
-  attribute_writer = ( attribute.to_s + "=" ).to_sym
+  attribute_writer = (attribute.to_s + "=").to_sym
   is_writable = obj.class.instance_methods(false).include?(attribute_writer)
 end
 
-def inherits_attr_read_only?( obj, attribute)
+def inherits_attr_read_only?(obj, attribute)
   inherits_attr_reader?(obj, attribute) && !inherits_attr_writer?(obj, attribute)
 end
 
@@ -66,4 +66,4 @@ module Tempo
       end
     end
   end
-end
+end

metadata

@@ -1,128 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: tempo-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Jonathan Gabel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-15 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12.2
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.12.2
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: '0.10'
 description: tempo-cli is a command line time tracking application.  Record time spent
   on projects in YAML files, and manage them from the command line.
 email: hello@jonathangabel.com
@@ -131,7 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -139,6 +124,7 @@ files:
 - bin/tempo
 - features/arrange.feature
 - features/checkout.feature
+- features/directory.feature
 - features/end.feature
 - features/project.feature
 - features/report.feature
@@ -150,6 +136,7 @@ files:
 - lib/file_record/directory.rb
 - lib/file_record/directory_structure/tempo/README.txt
 - lib/file_record/directory_structure/tempo/tempo_projects.yaml
+- lib/file_record/file_utility.rb
 - lib/file_record/record.rb
 - lib/tempo.rb
 - lib/tempo/controllers/arrange_controller.rb
@@ -206,28 +193,28 @@ files:
 - test/support/helpers.rb
 - test/test_helper.rb
 homepage: https://github.com/josankapo/tempo-cli
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A command line time tracker for recording by day and by project
 test_files: []