one_inch_punch 0.4.0 → 0.4.1

data/History.txt

@@ -1,3 +1,9 @@
+== 0.4.1 2008-08-26
+
+* 1 tiny enhancement:
+  * allowing command-line log message to be specified with --message
+    (will take precedence over normal message argument if both are specified)
+
 == 0.4.0 2008-08-17
 
 * 1 minor enhancement:

data/bin/punch

@@ -30,9 +30,9 @@ BANNER
   opts.on('--before [TIME]', String,
           "Restrict command to only before the given time") { |time|  OPTIONS[:before] = Time.parse(time) }
   opts.on('--at [TIME]', '--time [TIME]', String,
-          "Use the given time to punch in/out") { |time|  OPTIONS[:time] = Time.parse(time) }
+          "Use the given time") { |time|  OPTIONS[:time] = Time.parse(time) }
   opts.on('-m', '--message [MESSAGE]', String,
-          "Add the given log message when punching in/out") { |message|  OPTIONS[:message] = message }
+          "Use the given log message") { |message|  OPTIONS[:message] = message }
   opts.on('--full',
           "Show full output for the command") { |full|  OPTIONS[:full] = true }
   opts.on('--short',
@@ -104,7 +104,7 @@ commands = {
   end,
   'log' => lambda do |project|
     if project
-      if message = ARGV[2]
+      if message = OPTIONS.delete(:message) || ARGV[2]
         if Punch.log(project, message, OPTIONS)
           Punch.write
         else

data/lib/punch/version.rb

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

data/spec/punch_command_spec.rb

@@ -535,6 +535,25 @@ describe 'punch command' do
       run_command('log', @project, @message)
     end
     
+    it 'should accept a message specified with --message' do
+      Punch.stub!(:write)
+      Punch.should.receive(:log).with(@project, @message, {})
+      run_command('log', @project, '--message', @message)
+    end
+    
+    it 'should accept a message specified with -m' do
+      Punch.stub!(:write)
+      Punch.should.receive(:log).with(@project, @message, {})
+      run_command('log', @project, '-m', @message)
+    end
+    
+    it 'should use the message option specified with --message over the command-line argument' do
+      other_message = 'some other message'
+      Punch.stub!(:write)
+      Punch.should.receive(:log).with(@project, other_message, {})
+      run_command('log', @project, @message, '-m', other_message)
+    end
+    
     it 'should pass a time if specified on the command line (with --time)' do
       time_option = '2008-08-23 15:39'
       time = Time.local(2008, 8, 23, 15, 39)
@@ -822,7 +841,7 @@ describe 'punch command' do
     end
     
     it 'should not run any punch command' do
-      [:in, :out, :delete, :status, :total, :log, :list].each do |command|
+      [:in, :out, :delete, :status, :total, :log, :list, :summary].each do |command|
         Punch.should.receive(command).never
       end
       run_command('bunk')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: one_inch_punch
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Yossef Mendelssohn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-17 00:00:00 -05:00
+date: 2009-08-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency