punched 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fdd61f9eabb988d556bbd57326f7e3183ab0e06bc89ad0793b7b6b10297d674
-  data.tar.gz: 0b01c0843ef8b1fdb35db945499abe6471eb02ddd9cd235d3a2573b1c62397ec
+  metadata.gz: 1904b731e6d56b8dc58e49fd74f61d274da5a56342cb97b81a8a9c165f67dcc3
+  data.tar.gz: d923efb27d5f2f6dea68ae9591a1a2d8ad602ba773a1155eb18642b61bbca434
 SHA512:
-  metadata.gz: ab670118039f178ccd2d2c86d73dbbffbeefd5143db78f8f8b4ac96fa978e07c41860260fd8501af17140786cd9816ce595b60c3348b20eb16d7e8584adef6c5
-  data.tar.gz: 882f24d878d733bc45bb38e94553968fad541e36a2eb08a29c5278d05f57de473e9ae3afcb312771b8594eeabf711d82e762ac991307c442e953e937a2471af2
+  metadata.gz: a98ac0bc3bb08062c85a97098bd5b5f9db1f5adb6f6dac97f02a4838dcde3f99feb91a90da7f45c4b2cf447a36e4cc70c832b1db3c2f0db40ae2d7c8f73a6df6
+  data.tar.gz: 7f097ad0f236ff27c7eb3dccde336aca01724a04f5613ff4a7eb3dcd9ca3d18438d4ec41cd391a769348ea482fc128971c1ed696ddb2d1d9b3d026c9624a1f02

data/lib/punchcard.rb

@@ -11,9 +11,9 @@ class PunchCard
   HOURLY_RATE_PATTERN = /^\s*(\d+)([^\d]+)*\s*/i.freeze
   TIME_POINT_PATTERN  = /^((\d+|.+?\s[\+\-]\d{4}?\s*)(\-)*(\d+|\s.+\d?)*)$/.freeze
   META_KEY_PATTERN    = /^([a-zA-Z0-9]+)\:\s*(.*)$/.freeze
-  VERSION             = '1.1.1'.freeze
+  VERSION             = '1.2.0'.freeze
 
-  attr_accessor :project
+  attr_accessor :title
 
   def initialize(project_name)
     @wilcard_for_filename = ''
@@ -29,10 +29,10 @@ class PunchCard
   def start
     output = []
     if start_time && !end_time
-      output << "'#{project}' already started (#{humanized_total} total)"
+      output << "'#{title_or_project}' already started (#{humanized_total} total)"
       output << duration(start_time, timestamp).to_s
     else
-      output << "'#{project}' started (#{humanized_total} total)"
+      output << "'#{title_or_project}' started (#{humanized_total} total)"
       self.start_time = timestamp
     end
     output.join("\n")
@@ -41,9 +41,9 @@ class PunchCard
   def stop
     output = []
     if end_time
-      output << "'#{@project}' already stopped (#{humanized_total} total)"
+      output << "'#{title_or_project}' already stopped (#{humanized_total} total)"
     elsif start_time
-      output << "'#{@project}' stopped (#{humanized_total} total)"
+      output << "'#{title_or_project}' stopped (#{humanized_total} total)"
       self.end_time = timestamp
     else
       output << 'Nothing to stop'
@@ -59,11 +59,23 @@ class PunchCard
     end
   end
 
+  def title_or_project
+    title || project
+  end
+
+  def title_and_project
+    if title != project
+      "#{title} [#{project}]"
+    else
+      project
+    end
+  end
+
   def status
     project_exists_or_stop!
     find_or_make_file
     output = []
-    output << (project + " (#{running_status})\n")
+    output << (title_or_project + " (#{running_status})\n")
     output << humanized_total
     output.join("\n")
   end
@@ -104,7 +116,7 @@ class PunchCard
       durations.push duration(starttime, endtime)
     end
     '"' + [
-      @project,
+      title_and_project,
       running_status,
       last_activity ? self.class.format_time(Time.at(last_activity).to_datetime) : '',
       humanized_total,
@@ -253,9 +265,9 @@ class PunchCard
     return str if str.nil?
 
     str.strip!
-    # This is some legacy... previous versions stored timestamp,
+    # here some legacy… previous versions stored timestamp,
     # but now punched stores date-time strings for better readability.
-    # So we have to convert timestamp and date-time format into timestamp here
+    # So we have to convert timestamp and date-time format into timestamp
     str =~ /^\d+$/ ? str.to_i : (str =~ /^\d{4}\-\d/ ? Time.parse(str).to_i : nil)
   end
 
@@ -286,7 +298,8 @@ class PunchCard
       end
       i += 1
     end
-    @project = title if title
+    @project = File.basename(project_file)
+    self.title = title
     timestamps
   end
 
@@ -328,7 +341,7 @@ class PunchCard
 
   def find_or_make_file
     write_string_to_project_file!(@project + "\n") unless project_exist?
-    @project = project_data.first
+    self.title ||= project_data.first
   end
 
   def find_or_make_settings_dir

data/spec/punchcard_spec.rb

@@ -1,6 +1,6 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 
-require "punchcard"
+require 'punchcard'
 require 'securerandom'
 
 def example_settings_dir
@@ -8,13 +8,12 @@ def example_settings_dir
 end
 
 def setup_example_settings_dir
-  Dir.glob(example_settings_dir+'/*').each { |file| File.delete(file) }
+  Dir.glob(example_settings_dir + '/*').each { |file| File.delete(file) }
   PunchCard.send(:remove_const, :SETTINGS_DIR)
   PunchCard.const_set(:SETTINGS_DIR, example_settings_dir)
 end
 
 describe PunchCard do
-
   before do
     setup_example_settings_dir
   end
@@ -25,8 +24,8 @@ describe PunchCard do
     PunchCard.new("My random Project #{SecureRandom.hex}")
   end
 
-  def my_project_file filename = 'my_project'
-    File.open("#{example_settings_dir}/#{filename}", "r").read
+  def my_project_file(filename = 'my_project')
+    File.open("#{example_settings_dir}/#{filename}", 'r').read
   end
 
   def start_and_stop
@@ -63,7 +62,7 @@ describe PunchCard do
   it 'should calculate tracked total time' do
     project      = two_seconds_tracking
     tracked_time = project.details.lines.last.match(/^\d{2}\:\d{2}\:(\d{2}).*total/)[1].to_i
-    expect(tracked_time).to  be_between 1, 3
+    expect(tracked_time).to be_between 1, 3
     project      = two_seconds_tracking
     tracked_time = project.details.lines.last.match(/^\d{2}\:\d{2}\:(\d{2}).*total/)[1].to_i
     expect(tracked_time).to be_between 3, 5
@@ -80,29 +79,29 @@ describe PunchCard do
     expect(my_project_file.lines[-2]).to match(/^\d+/)
   end
 
-  it 'should read and write utf8 names' do
-    PunchCard.new "Playing Motörhead"
-    expect(my_project_file('playing_mot_rhead').strip).to eq("Playing Motörhead")
-    project = PunchCard.new "Playing*"
-    expect(project.project).to eq("Playing Motörhead")
+  it 'should convert names to underscore with special characters' do
+    PunchCard.new 'Playing Motörhead'
+    expect(my_project_file('playing_mot_rhead').strip).to eq('Playing Motörhead')
+    project = PunchCard.new 'Playing*'
+    expect(project.project).to eq('playing_mot_rhead')
   end
 
   it 'should set hourlyRate' do
     project = start_and_stop
-    project.set 'hourlyRate', "1000 €"
-    expect(my_project_file.lines[1].strip).to eq("hourlyRate: 1000 €")
+    project.set 'hourlyRate', '1000 €'
+    expect(my_project_file.lines[1].strip).to eq('hourlyRate: 1000 €')
   end
 
   it 'should calculate earnings' do
     project = start_and_stop
-    project.set 'hourlyRate', "1000EURO"
+    project.set 'hourlyRate', '1000EURO'
     project.toggle
     sleep 2
     project.toggle
     project.toggle
     sleep 2
     project.toggle
-    expect(project.csv).to match /^"My Project","stopped","[0-9\-\s\:]+?","[0-9\:]+?","1000.0 EURO","1\.\d+ EURO"$/
+    expect(project.csv).to match /^"My Project \[my_project\]","stopped","[0-9\-\s\:]+?","[0-9\:]+?","1000.0 EURO","1\.\d+ EURO"$/
   end
 
   it 'should track different projects simultanously' do
@@ -115,16 +114,16 @@ describe PunchCard do
     project_a.stop
     sleep 2
     project_b.stop
-    expect(project_b.total.to_i - project_a.total.to_i).to be_between(2,4)
+    expect(project_b.total.to_i - project_a.total.to_i).to be_between(2, 4)
   end
 
   it 'should load latest project by wildcard' do
     project_a = random_project
-    project   = PunchCard.new "My random*"
+    project   = PunchCard.new 'My random*'
     expect(project.project).to eq(project_a.project)
     sleep 1
     project_b = random_project
-    project   = PunchCard.new "My random*"
+    project   = PunchCard.new 'My random*'
     expect(project.project).to eq(project_b.project)
     expect(project.project).not_to eq(project_a.project)
   end
@@ -133,23 +132,22 @@ describe PunchCard do
     project = example_project
     content = my_project_file
     project.rename 'Renamed Project'
-    expect(File.open("#{example_settings_dir}/renamed_project", "r").read.strip).to eq(content.strip.sub(/My Project/, 'Renamed Project'))
-    expect(File.exists?("#{example_settings_dir}/my_project")).to be_falsey
+    expect(File.open("#{example_settings_dir}/renamed_project", 'r').read.strip).to eq(content.strip.sub(/My Project/, 'Renamed Project'))
+    expect(File.exist?("#{example_settings_dir}/my_project")).to be_falsey
     expect(project.project).to eq('Renamed Project')
     project.start
     sleep 0.1
     project.stop
-    content = File.open("#{example_settings_dir}/renamed_project", "r").read.strip
+    content = File.open("#{example_settings_dir}/renamed_project", 'r').read.strip
     project.rename 'Other Project'
-    expect(File.open("#{example_settings_dir}/other_project", "r").read.strip).to eq(content.strip.sub(/Renamed Project/, 'Other Project'))
-    expect(File.exists?("#{example_settings_dir}/renamed_project")).to be_falsey
+    expect(File.open("#{example_settings_dir}/other_project", 'r').read.strip).to eq(content.strip.sub(/Renamed Project/, 'Other Project'))
+    expect(File.exist?("#{example_settings_dir}/renamed_project")).to be_falsey
   end
 
   it 'should remove' do
     project = example_project
-    expect(File.exists?("#{example_settings_dir}/my_project")).to be_truthy
+    expect(File.exist?("#{example_settings_dir}/my_project")).to be_truthy
     project.remove
-    expect(File.exists?("#{example_settings_dir}/my_project")).to be_falsey
+    expect(File.exist?("#{example_settings_dir}/my_project")).to be_falsey
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: punched
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Philipp Staender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-27 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: markdown-tables
@@ -60,8 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: punched
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Punchcard Timetracker