one_inch_punch 0.3.2 → 0.3.3

data/History.txt

@@ -1,3 +1,9 @@
+== 0.3.3 2008-06-25
+
+* 1 tiny enhancement:
+  * added 'short' status, which only displays what's currently punched in (or 'out' if nothing)
+    * punch command displays status as YAML if it's a hash, like it does for total
+
 == 0.3.2 2008-06-01
 
 * 1 tiny bugfix enhancement:

data/bin/punch

@@ -35,6 +35,8 @@ BANNER
           "Add the given log message when punching in/out") { |message|  OPTIONS[:message] = message }
   opts.on('--full',
           "Show full output for the command") { |full|  OPTIONS[:full] = true }
+  opts.on('--short',
+          "Show short output for the command") { |full|  OPTIONS[:short] = true }
   opts.on("-h", "--help",
           "Show this help message.") { puts opts; exit }
   opts.parse!(ARGV)
@@ -58,7 +60,7 @@ Punch.load
 commands = {
   'status' => lambda do |project|
     result = Punch.status(project, OPTIONS)
-    if project.nil? or OPTIONS[:full]
+    if result.is_a?(Hash)
       puts result.to_yaml
     else
       puts result.inspect

data/lib/punch/version.rb

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

data/lib/punch.rb

@@ -45,7 +45,15 @@ class Punch
         project = nil
       end
       
-      return projects.inject({}) { |hash, project|  hash.merge(project => status(project, options)) } unless project
+      unless project
+        stats = {}
+        projects.each { |project|  stats[project] = status(project, options) }
+        if options[:short]
+          stats.reject! { |k, v|  v != 'in' }
+          stats = 'out' if stats.empty?
+        end
+        return stats
+      end
       
       project_data = data[project]
       time_data = (project_data || []).last

data/spec/punch_command_spec.rb

@@ -163,8 +163,8 @@ describe 'punch command' do
       run_command('status', @project)
     end
     
-    it 'should output the status as YAML if no project given' do
-      result = 'status data'
+    it "should output the status as YAML if the status data is a Hash" do
+      result = { 'status' => 'data' }
       Punch.stub!(:status).and_return(result)
       self.should.receive(:puts).with(result.to_yaml)
       run_command('status')
@@ -180,18 +180,14 @@ describe 'punch command' do
       run_command('status', '--full')
     end
     
-    it 'should output the status as YAML if a full option is given' do
-      result = 'status data'
-      Punch.stub!(:status).and_return(result)
-      self.should.receive(:puts).with(result.to_yaml)
-      run_command('status', @project, '--full')
+    it 'should pass a true short option if specified on the command line (with --short)' do
+      Punch.should.receive(:status).with(@project, :short => true)
+      run_command('status', @project, '--short')
     end
     
-    it 'should output the status as YAML if no project given even if a full option is given' do
-      result = 'status data'
-      Punch.stub!(:status).and_return(result)
-      self.should.receive(:puts).with(result.to_yaml)
-      run_command('status', '--full')
+    it 'should pass a true short option if specified on the command line (with --short) and no project given' do
+      Punch.should.receive(:status).with(nil, :short => true)
+      run_command('status', '--short')
     end
     
     it 'should not write the data' do

data/spec/punch_spec.rb

@@ -235,12 +235,77 @@ describe Punch do
         }
       end
       
-      it 'should return the full status if all projects if no project given' do
+      it 'should return the full status of all projects if no project given' do
         Punch.status(:full => true).should == {
           @projects['out'] => { :status => 'out', :time => @now + 12 },
           @projects['in']  => { :status => 'in',  :time => @now }
         }
       end
+      
+      describe 'when given a :short option' do
+        it "should return 'in' if the project is currently punched in" do
+          Punch.status(@projects['in'], :short => true).should == 'in'
+        end
+        
+        it "should return 'out' if the project is currently punched out" do
+          Punch.status(@projects['out'], :short => true).should == 'out'
+        end
+        
+        it 'should return nil if project does not exist' do
+          Punch.status('other project', :short => true).should.be.nil
+        end
+        
+        describe 'handling multiple projects' do
+          before do
+            @projects['in2']  = 'bingbang'
+            @projects['out2'] = 'boopadope'
+            @data[@projects['in2']]  = [ { 'in' => @now - 5 } ]
+            @data[@projects['out2']] = [ { 'in' => @now - 500, 'out' => @now - 20 } ]
+            Punch.data = @data
+          end
+          
+          it 'should return just the punched-in projects if nil is given as the project' do
+            Punch.status(nil, :short => true).should == {
+              @projects['in']  => 'in',
+              @projects['in2'] => 'in'
+            }
+          end
+          
+          it 'should return just the punched-in projects if no project given' do
+            Punch.status(:short => true).should == {
+              @projects['in']  => 'in',
+              @projects['in2'] => 'in'
+            }
+          end
+          
+          it 'should not include empty projects' do
+            @data['empty_project'] = []
+            Punch.data = @data
+            
+            Punch.status(:short => true).should == {
+              @projects['in']  => 'in',
+              @projects['in2'] => 'in'
+            }
+          end
+          
+          it "should return 'out' if all projects are punched out" do
+            @data.delete(@projects['in'])
+            @data.delete(@projects['in2'])
+            Punch.data = @data
+            
+            Punch.status(:short => true).should == 'out'
+          end
+          
+          it "should return 'out' if all projects are punched out or empty" do
+            @data.delete(@projects['in'])
+            @data.delete(@projects['in2'])
+            @data['empty_project'] = []
+            Punch.data = @data
+            
+            Punch.status(:short => true).should == 'out'
+          end
+        end
+      end
     end
     
     describe 'handling a sub-project' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: one_inch_punch
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Yossef Mendelssohn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-01 00:00:00 -05:00
+date: 2009-06-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: yomendel
-rubygems_version: 1.3.3
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: a simple time-tracking tool