beggar 1.0.2 → 1.0.4

data/.travis.yml

@@ -1,7 +1,5 @@
 rvm:
-  - 1.9.2
   - 1.9.3
-  - ruby-head
 script: bundle exec rspec spec
 notifications:
   email:

data/Gemfile.lock

@@ -2,17 +2,35 @@ PATH
   remote: .
   specs:
     beggar (1.0.2)
+      holidays
       httparty
+      mechanize
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    httparty (0.8.1)
-      multi_json
+    domain_name (0.5.6)
+      unf (~> 0.0.3)
+    holidays (1.0.5)
+    httparty (0.9.0)
+      multi_json (~> 1.0)
       multi_xml
-    multi_json (1.1.0)
-    multi_xml (0.4.1)
+    mechanize (2.5.1)
+      domain_name (~> 0.5, >= 0.5.1)
+      mime-types (~> 1.17, >= 1.17.2)
+      net-http-digest_auth (~> 1.1, >= 1.1.1)
+      net-http-persistent (~> 2.5, >= 2.5.2)
+      nokogiri (~> 1.4)
+      ntlm-http (~> 0.1, >= 0.1.1)
+      webrobots (~> 0.0, >= 0.0.9)
+    mime-types (1.19)
+    multi_json (1.5.0)
+    multi_xml (0.5.1)
+    net-http-digest_auth (1.2.1)
+    net-http-persistent (2.8)
+    nokogiri (1.5.6)
+    ntlm-http (0.1.1)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -21,6 +39,10 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
+    unf (0.0.5)
+      unf_ext
+    unf_ext (0.0.5)
+    webrobots (0.0.13)
 
 PLATFORMS
   ruby

data/README.md

@@ -7,7 +7,7 @@ Beggar is a tool for generating time reports from your Basecamp account
 Example output:
 
     Current month
-    Weekdays:     78%
+    Workdays:     78%
     Worked hours: 140.0h (-12.0h)
     Salary:       5320.0zł (-456.0zł)
 
@@ -30,8 +30,21 @@ Example config:
     company: pear
     token: abc123
     rate: 50.0
+    country: pl
 
 ## Changelog
-  v1.0.1 - change output
-  v1.0.0 - first stable release
 
+<table>
+    <tr>
+        <td>v1.0.3</td><td>don't count holidays as working days</td>
+    </tr>
+    <tr>
+        <td>v1.0.2</td><td>fix bug when time entries are empty</td>
+    </tr>
+    <tr>
+        <td>v1.0.1</td><td>change output</td>
+    </tr>
+    <tr>
+        <td>v1.0.0</td><td>first stable release</td>
+    </tr>
+</table>

data/beggar.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec", ">= 2.7.0"
   s.add_dependency "httparty"
+  s.add_dependency "mechanize"
+  s.add_dependency "holidays"
 end

data/lib/beggar/base.rb

@@ -8,7 +8,7 @@ module Beggar
     end
 
     def progress
-      "#{CurrentMonth.weekdays_progression}%"
+      "#{basecamp.workdays_progression}%"
     end
 
     def worked_hours
@@ -21,7 +21,7 @@ module Beggar
 
     def summary
       %Q{Current month
-Weekdays:     #{progress}
+Workdays:     #{progress}
 Worked hours: #{worked_hours}
 Salary:       #{salary}}
     end

data/lib/beggar/basecamp.rb

@@ -20,12 +20,12 @@ module Beggar
       @current_user ||= self.class.get('/me.xml')['person']['id']
     end
 
-    def current_month
-      @current_month ||= time_report(from: CurrentMonth.first_day, to: CurrentMonth.today)
+    def current_month_report
+      @current_month_report ||= time_report(from: current_month.first_day, to: current_month.today)
     end
 
     def worked_hours
-      time_entries = current_month['time_entries']
+      time_entries = current_month_report['time_entries']
       return 0 if time_entries.empty?
       time_entries.map do |entry|
         entry['hours']
@@ -33,7 +33,15 @@ module Beggar
     end
 
     def hours_ratio
-      CurrentMonth.weekday_hours_until_today - worked_hours
+      current_month.workday_hours_until_today - worked_hours
+    end
+
+    def workdays_progression
+      current_month.workdays_progression
+    end
+
+    def current_month
+      @current_month ||= CurrentMonth.new(:country => @config['country'])
     end
   end
 end

data/lib/beggar/cli.rb

@@ -31,7 +31,8 @@ module Beggar
           {
             "company" => "___",
             "token" => "___",
-            "rate" => "___"
+            "rate" => "___",
+            "country" => "___"
           }
         end
 

data/lib/beggar/current_month.rb

@@ -1,49 +1,54 @@
+require 'holidays'
+
 module Beggar
   class CurrentMonth
-    class << self
-      def weekdays
-        weekdays_until(last_day)
-      end
-
-      def weekdays_until_today
-        weekdays_until(today)
-      end
-
-      def weekday_hours
-        weekdays * 8.0
-      end
-
-      def weekday_hours_until_today
-        weekdays_until_today * 8.0
-      end
-
-      def weekdays_progression
-        (weekdays_until_today * 100.0 / weekdays).round
-      end
-
-      def weekdays_until(date)
-        (first_day..date).reject { |d| [0, 6].include? d.wday }.length
-      end
-
-      def first_day
-        Date.new(year, month, 1)
-      end
-
-      def last_day
-        first_day.next_month - 1
-      end
-
-      def year
-        today.year
-      end
-
-      def month
-        today.month
-      end
-
-      def today
-        Date.today
-      end
+    def initialize(options = {})
+      @country = options[:country]
+    end
+
+    def workdays
+      workdays_until(last_day)
+    end
+
+    def workdays_until_today
+      workdays_until(today)
+    end
+
+    def workday_hours
+      workdays * 8.0
+    end
+
+    def workday_hours_until_today
+      workdays_until_today * 8.0
+    end
+
+    def workdays_progression
+      (workdays_until_today * 100.0 / workdays).round
+    end
+
+    def workdays_until(date)
+      (first_day..date).reject { |d|
+        [0, 6].include?(d.wday) || d.holiday?(@country) }.length
+    end
+
+    def first_day
+      Date.new(year, month, 1)
+    end
+
+    def last_day
+      first_day.next_month - 1
+    end
+
+    def year
+      today.year
+    end
+
+    def month
+      today.month
+    end
+
+    def today
+      Date.today
     end
   end
 end

data/lib/beggar/version.rb

@@ -1,4 +1,4 @@
 module Beggar
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end
 

data/spec/base_spec.rb

@@ -2,7 +2,8 @@
 require 'beggar'
 
 describe Beggar::Base do
-  let(:basecamp) { double('Basecamp', config: { 'rate' => 50.0 }) }
+  let(:config) { YAML.load_file(File.expand_path('../fixtures/beggar', __FILE__)) }
+  let(:basecamp) { Beggar::Basecamp.new(config) }
   let(:base) { Beggar::Base.new(basecamp) }
 
   describe 'displaying weekdays progression as a percents' do
@@ -11,9 +12,9 @@ describe Beggar::Base do
       base.progress.should == "62%"
     end
 
-    it 'returns 9% on 2nd December 2011' do
+    it 'returns 10% on 2nd December 2011' do
       Date.stub(today: Date.new(2011, 12, 2))
-      base.progress.should == "9%"
+      base.progress.should == "10%"
     end
 
     it 'returns 100% on 30th November 1988' do
@@ -65,7 +66,7 @@ describe Beggar::Base do
   it 'returns summary' do
     base.stub(progress: "78%", worked_hours: "140.0h (-12.0h)", salary: "5320.0zł (-456.0zł)")
     base.summary.should == %q{Current month
-Weekdays:     78%
+Workdays:     78%
 Worked hours: 140.0h (-12.0h)
 Salary:       5320.0zł (-456.0zł)}
   end

data/spec/basecamp_spec.rb

@@ -43,29 +43,29 @@ describe Beggar::Basecamp do
         to: Date.new(2012, 02,17)
       }
     )
-    basecamp.current_month
+    basecamp.current_month_report
   end
 
   it 'returns worked hours' do
     response = { "time_entries" =>
       [{ "hours" => 8.0 }, { "hours" => 6.0 }, { "hours" => 8.0 }]
     }
-    basecamp.stub(current_month: response)
+    basecamp.stub(current_month_report: response)
     basecamp.worked_hours.should == 22.0
   end
 
   it 'returns 0 when no time entries' do
     response = { "time_entries" => [] }
-    basecamp.stub(current_month: response)
+    basecamp.stub(current_month_report: response)
     basecamp.worked_hours.should == 0
   end
 
-  it 'returns hours ratio with minus when working hours > weekdays hours' do
+  it 'returns hours ratio with minus when working hours > workdays hours' do
     basecamp.stub(worked_hours: 106.0)
     basecamp.hours_ratio.should == -2.0
   end
 
-  it 'returns hours ratio with plus when worked hours < weekdays hours' do
+  it 'returns hours ratio with plus when worked hours < workdays hours' do
     basecamp.stub(worked_hours: 96.0)
     basecamp.hours_ratio.should == 8.0
   end

data/spec/cli_spec.rb

@@ -28,7 +28,8 @@ describe Beggar::CLI do
       {
         "company" => "___",
         "token" => "___",
-        "rate" => "___"
+        "rate" => "___",
+        "country" => "___"
       }
     }
 

data/spec/current_month_spec.rb

@@ -1,35 +1,35 @@
 require 'beggar'
 
 describe Beggar::CurrentMonth do
-  let(:current_month) { Beggar::CurrentMonth }
+  let(:current_month) { Beggar::CurrentMonth.new(:country => 'pl') }
 
   before do
     Date.stub(today: Date.new(2012, 2, 17))
   end
 
-  it 'returns weekdays' do
-    current_month.weekdays.should == 21
+  it 'returns workdays' do
+    current_month.workdays.should == 21
   end
 
-  it 'returns weekdays until today' do
-    current_month.weekdays_until_today.should == 13
+  it 'returns workdays until today' do
+    current_month.workdays_until_today.should == 13
   end
 
-  it 'returns weekdays in hours' do
-    current_month.weekday_hours.should == 168.0
+  it 'returns workdays in hours' do
+    current_month.workday_hours.should == 168.0
   end
 
-  it 'returns weekdays in hours until today' do
-    current_month.weekday_hours_until_today.should == 104.0
+  it 'returns workdays in hours until today' do
+    current_month.workday_hours_until_today.should == 104.0
   end
 
-  it 'returns weekdays progression' do
-    current_month.weekdays_progression.should == 62
+  it 'returns workdays progression' do
+    current_month.workdays_progression.should == 62
   end
 
-  it 'returns weekdays until date' do
+  it 'returns workdays until date' do
     date = Date.new(2012, 2, 23)
-    current_month.weekdays_until(date).should == 17
+    current_month.workdays_until(date).should == 17
   end
 
   it 'returns first day of month' do

data/spec/fixtures/beggar

@@ -1,4 +1,4 @@
 company: pear
 token: abc123
 rate: 50.0
-
+country: pl

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beggar
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-03 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70354965969800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,31 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70354965969800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70354965969380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +53,28 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70354965969380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: holidays
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Tool for generating time reports from Basecamp. You can specify rate
   for each project and get value of your month salary.
 email:
@@ -83,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: beggar
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Tool for generating time reports from Basecamp