one_inch_punch 0.1.3 → 0.1.4

data/History.txt

@@ -1,3 +1,10 @@
+== 0.1.4 2008-10-23
+
+* punch command enhancements:
+  * can now list data (outputs as YAML)
+  * will output status as YAML if giving status of all projects
+  * will output total as YAML if giving total of all projects
+
 == 0.1.3 2008-09-30
 
 * 3 enhancements:

data/README.txt

@@ -18,9 +18,7 @@ One-inch punch: Smaller, more effective
 * Can list project data
 * Can give total time for a project
 * Can be used command-line
-
-* Command-line does not give access to the list operation
-* Command-line output is ugly
+* Command-line output is less ugly
 * More, since this is unfinished
 
 == SYNOPSIS:

data/bin/punch

@@ -54,8 +54,22 @@ project = ARGV[1]
 Punch.load
 
 commands = {
-  'status' => lambda { |project|  puts Punch.status(project).inspect },
-  'total'  => lambda { |project|  puts Punch.total(project, OPTIONS.merge(:format => true)).inspect },
+  'status' => lambda do |project|
+    result = Punch.status(project)
+    if project
+      puts result.inspect
+    else
+      puts result.to_yaml
+    end
+  end,
+  'total'  => lambda do |project|
+    result = Punch.total(project, OPTIONS.merge(:format => true))
+    if project
+      puts result.inspect
+    else
+      puts result.to_yaml
+    end
+  end,
   'in'     => lambda do |project|
     if project
       if Punch.in(project, OPTIONS)
@@ -98,7 +112,8 @@ commands = {
     else
       puts "Project required"
     end
-  end
+  end,
+  'list' => lambda { |project|  puts Punch.list(project, OPTIONS).to_yaml },
 }
 
 if command_code = commands[command]

data/config/hoe.rb

@@ -10,6 +10,10 @@ DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 EXTRA_DEPENDENCIES = [
 #  ['activesupport', '>= 1.3.1']
 ]    # An array of rubygem dependencies [name, version]
+EXTRA_DEV_DEPENDENCIES = [
+  ['rspec', '>= 1.1.4'],
+  ['mocha', '>= 0.9.1']
+]    # An array of rubygem dependencies [name, version]
 
 @config_file = "~/.rubyforge/user-config.yml"
 @config = nil
@@ -61,10 +65,12 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
 
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = EXTRA_DEPENDENCIES
-
-    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  end
+  p.extra_deps = EXTRA_DEPENDENCIES
+  p.extra_dev_deps = EXTRA_DEV_DEPENDENCIES
+  
+  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
+  
+end
 
 CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
 PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"

data/lib/punch/version.rb

@@ -2,7 +2,7 @@ module Punch
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/punch_command_spec.rb

@@ -59,6 +59,13 @@ describe 'punch command' do
       result = 'total data'
       Punch.stubs(:total).returns(result)
       self.expects(:puts).with(result.inspect)
+      run_command('total', @project)
+    end
+    
+    it 'should output the total as YAML if no project given' do
+      result = 'total data'
+      Punch.stubs(:total).returns(result)
+      self.expects(:puts).with(result.to_yaml)
       run_command('total')
     end
     
@@ -134,6 +141,13 @@ describe 'punch command' do
       result = 'status data'
       Punch.stubs(:status).returns(result)
       self.expects(:puts).with(result.inspect)
+      run_command('status', @project)
+    end
+    
+    it 'should output the status as YAML if no project given' do
+      result = 'status data'
+      Punch.stubs(:status).returns(result)
+      self.expects(:puts).with(result.to_yaml)
       run_command('status')
     end
     
@@ -520,6 +534,70 @@ describe 'punch command' do
     end
   end
   
+  describe "when the command is 'list'" do
+    before :each do
+      Punch.stubs(:list)
+    end
+    
+    it 'should load punch data' do
+      Punch.expects(:load)
+      run_command('list', @project)
+    end
+    
+    it 'should get the data for the requested project' do
+      Punch.expects(:list).with(@project, anything)
+      run_command('list', @project)
+    end
+    
+    it 'should get the data for all projects if none given' do
+      Punch.expects(:list).with(nil, anything)
+      run_command('list')
+    end
+    
+    it 'should output the list data' do
+      result = 'list data'
+      Punch.stubs(:list).returns(result)
+      self.expects(:puts).with(result.to_yaml)
+      run_command('list')
+    end
+    
+    describe 'when options specified' do
+      it "should pass on an 'after' time option given by --after" do
+        time_option = '2008-08-26 09:47'
+        time = Time.local(2008, 8, 26, 9, 47)
+        Punch.expects(:list).with(@project, has_entry(:after => time))
+        run_command('list', @project, '--after', time_option)
+      end
+      
+      it "should pass on a 'before' time option given by --before" do
+        time_option = '2008-08-23 15:39'
+        time = Time.local(2008, 8, 23, 15, 39)
+        Punch.expects(:list).with(@project, has_entry(:before => time))
+        run_command('list', @project, '--before', time_option)
+      end
+      
+      it 'should handle a time option given as a date' do
+        time_option = '2008-08-23'
+        time = Time.local(2008, 8, 23)
+        Punch.expects(:list).with(@project, has_entry(:before => time))
+        run_command('list', @project, '--before', time_option)
+      end
+      
+      it 'should accept time options if no project given' do
+        time_option = '2008-08-26 09:47'
+        time = Time.local(2008, 8, 26, 9, 47)
+        Punch.expects(:list).with(nil, has_entry(:before => time))
+        run_command('list', '--before', time_option)
+      end
+    end
+    
+    it 'should not write the data' do
+      @states['write'].become('test')
+      Punch.expects(:write).never.when(@states['write'].is('test'))
+      run_command('list')
+    end
+  end
+  
   describe 'when the command is unknown' do
     it 'should not error' do
       lambda { run_command('bunk') }.should_not raise_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: one_inch_punch
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Yossef Mendelssohn
@@ -9,9 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-30 00:00:00 -05:00
+date: 2008-10-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.1
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -20,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.0
     version: 
 description: a simple time-tracking tool
 email: 
@@ -83,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: yomendel
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: a simple time-tracking tool