goal 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e6dc9f385d0532851d70b7d1d37a24cb250709f
-  data.tar.gz: 636a43dc39b232239589589602b3691f9b23ccf8
+  metadata.gz: 8d56f5e9e0c22d0b08781b9dbdf216e984a6d1a8
+  data.tar.gz: bd8b68ca175fff89f194f74d918aa73d4d9dc50d
 SHA512:
-  metadata.gz: 16be09eaf6287db18b6fa0e3aee7e25142b4e705baabbbc733a362e16a8ac4eab8018682637c103d449793b381364ecd0f5442e2e539d88d93ceb25197bc4b22
-  data.tar.gz: 1880eda0ab7fb3e59fd0969ed4ccc30223f725381edac0143fff21c867c8b478d85268da348e68c535ed74f1738780878578ae11135c296b142b1314397c617c
+  metadata.gz: 8a958a934fcbf74fdb4ba7dc3d99ca9209f412a62cde80d10eff55f72ab8df457a9c27fe686009a7d733f943ed188a0309190dbde96b03b86bfefca57471d446
+  data.tar.gz: 1dcc996014c566cbf6bdc477457128b5ac6bbfd555e648aaa2e1f30d6e479b7af4a0d68b5c002b9e4b4ae17cc3dcf6ddf21e4f79f021b39838267526d7f6e3f1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    goal (0.1.0)
+    goal (0.3.0)
       colorize (~> 0.6.0)
       ruby-freshbooks (~> 0.4.1)
 

data/bin/goal

@@ -16,6 +16,10 @@ optparse = OptionParser.new do |opts|
     options[:token] = t
   end
 
+  opts.on("-p", "--project=PROJECT", "Freshbooks project id") do |p|
+    options[:project_id] = p.to_i
+  end
+
   opts.on("-g", "--goals=[GOALS]", "Your goal list. Ex 160:200:300") do |g|
     options[:goal_list] = g.split(':').map(&:to_i)
   end
@@ -27,11 +31,15 @@ optparse = OptionParser.new do |opts|
   opts.on("-m", "--money=MONEY", "The money rate.") do |m|
     options[:money_rate] = m.to_f
   end
+
+  opts.on("-d", "--start_day=START_DAY", "Start day.") do |s|
+    options[:start_day] = s.to_i
+  end
 end
 
 optparse.parse!
 
-unless options[:hours] || (options[:username] && options[:token])
+unless options[:hours] || (options[:username] && options[:token] && options[:project_id])
   puts 'Arguments -h or -u and -t are required.'
   puts optparse
   exit

data/lib/goal.rb

@@ -5,18 +5,20 @@ require 'goal/report'
 module Goal
   class Calculator
     def initialize(options = {})
-      @calculator = Goal::HourCalculator.new
-      @goal_list = options.fetch(:goal_list, [160, 200, 250, 300])
-      @username  = options[:username]
-      @token     = options[:token]
-      @hours     = options[:hours]
+      @goal_list  = options.fetch(:goal_list, [160, 200, 250, 300])
+      @username   = options[:username]
+      @token      = options[:token]
+      @project_id = options[:project_id]
+      @hours      = options[:hours]
       @money_rate = options[:money_rate]
+      @start_day  = options.fetch(:start_day, 1)
+      @calculator = Goal::HourCalculator.new(start_day)
     end
 
     def worked_time
-      if hours
+      @time ||= if hours
         hours
-      elsif username && token
+      elsif username && token && project_id
         freshbooks.hours
       else
         0
@@ -44,10 +46,10 @@ module Goal
     private
 
     attr_reader :base, :calculator, :goal_list, :username, :token, :hours,
-      :money_rate
+      :money_rate, :start_day, :project_id
 
     def freshbooks
-      Goal::FreshbooksCalculator.new(username, token)
+      Goal::FreshbooksCalculator.new(username, token, project_id, start_day)
     end
 
     def goals

data/lib/goal/freshbooks_calculator.rb

@@ -2,9 +2,11 @@ require 'ruby-freshbooks'
 
 module Goal
   class FreshbooksCalculator
-    def initialize(freshbooks_username, token)
-      @username = freshbooks_username
-      @token    = token
+    def initialize(freshbooks_username, token, project_id, start_day)
+      @username   = freshbooks_username
+      @token      = token
+      @project_id = project_id
+      @start_day  = start_day
     end
 
     def hours
@@ -13,24 +15,28 @@ module Goal
 
     private
 
-    attr_reader :username, :token
+    attr_reader :username, :token, :start_day, :project_id
 
     def entries_for_month
-      entries = connection.time_entry.list(date_from: date_from, date_to: date_to, per_page: per_page)
-
-      if entries.has_key?('time_entries')
-        entries['time_entries']['time_entry']
+      entries = connection.time_entry.list(date_from: date_from, date_to: date_to, project_id: project_id, per_page: per_page)
+
+      if entries.has_key?('time_entries') &&entries['time_entries'].has_key?('time_entry')
+        if entries['time_entries']['time_entry'].is_a?(Array)
+          entries['time_entries']['time_entry']
+        else
+          [] << entries['time_entries']['time_entry']
+        end
       else
         []
       end
     end
 
     def date_from
-      Date.new Date.today.year, Date.today.month, 1
+      Date.new Date.today.year, Date.today.month, start_day
     end
 
     def date_to
-      Date.new Date.today.year, Date.today.month, -1
+      date_from + 30
     end
 
     def per_page

data/lib/goal/hour_calculator.rb

@@ -1,10 +1,14 @@
 module Goal
   class HourCalculator
+    def initialize(start_day)
+      @start_day = start_day
+    end
+
     def total_days_until(date = Date.today)
       total = 0
       month = Date.today.month
       year  = Date.today.year
-      date.day.downto(1) do |day|
+      date.day.downto(start_day) do |day|
         current = Date.new(year, month, day)
 
         total += 1 unless current.saturday? || current.sunday?
@@ -15,7 +19,7 @@ module Goal
 
     def estimated_for(goal)
       current_days = total_days_until
-      total_days   = total_days_until(end_of_month)
+      total_days   = total_days_until(end_of_period)
 
       hours_per_day = goal.to_f / total_days.to_f
 
@@ -31,13 +35,15 @@ module Goal
     end
 
     def days_left
-      total_days_until(end_of_month) - total_days_until + 1
+      total_days_until(end_of_period) - total_days_until + 1
     end
 
     private
 
-    def end_of_month
-      Date.new(Date.today.year, Date.today.month, -1)
+    attr_reader :start_day
+
+    def end_of_period
+      Date.new(Date.today.year, Date.today.month, start_day) + 30
     end
   end
 end

data/lib/goal/version.rb

@@ -1,3 +1,3 @@
 module Goal
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'
 end

data/spec/calculator_spec.rb

@@ -14,13 +14,13 @@ describe Goal::Calculator do
 
     context 'with hours' do
       subject do
-        described_class.new(username: 'username', token: 'token')
+        described_class.new(username: 'username', token: 'token', project_id: 222)
       end
 
       it 'should return the freshbooks hours' do
         instance = double(:instance)
 
-        Goal::FreshbooksCalculator.should_receive(:new).with('username', 'token').and_return(instance)
+        Goal::FreshbooksCalculator.should_receive(:new).with('username', 'token', 222, 1).and_return(instance)
         instance.should_receive(:hours).and_return 55.55
 
         expect(subject.worked_time).to eq 55.55

data/spec/freshbooks_calculator_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe Goal::FreshbooksCalculator do
   let(:time_entry) { double(:time_entry) }
   let(:connection) { double(:connection, time_entry: time_entry) }
-  let(:end_of_month) { Date.new Date.today.year, Date.today.month, -1 }
-  let(:begin_of_month) { Date.new Date.today.year, Date.today.month, 1 }
+  let(:begin_of_month) { Date.new Date.today.year, Date.today.month, 5 }
 
   let :entries do
     {
@@ -29,7 +28,7 @@ describe Goal::FreshbooksCalculator do
   end
 
   subject do
-    described_class.new 'username', 'token'
+    described_class.new 'username', 'token', 12, 5
   end
 
   describe '#hours' do
@@ -38,7 +37,7 @@ describe Goal::FreshbooksCalculator do
         FreshBooks::Client.should_receive(:new).with('username.freshbooks.com', 'token').and_return(connection)
         time_entry.
           should_receive(:list).
-          with(date_from: begin_of_month, date_to: end_of_month, per_page: 1000).
+          with(date_from: begin_of_month, date_to: begin_of_month + 30, project_id: 12, per_page: 1000).
           and_return(entries)
 
         expect(subject.hours).to eq 15.9
@@ -50,7 +49,7 @@ describe Goal::FreshbooksCalculator do
         FreshBooks::Client.should_receive(:new).with('username.freshbooks.com', 'token').and_return(connection)
         time_entry.
           should_receive(:list).
-          with(date_from: begin_of_month, date_to: end_of_month, per_page: 1000).
+          with(date_from: begin_of_month, date_to: begin_of_month + 30, project_id: 12, per_page: 1000).
           and_return(error_entries)
 
         expect(subject.hours).to eq 0

data/spec/hour_calculator_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Goal::HourCalculator do
+  subject do
+    described_class.new(1)
+  end
+
   describe '#total_days_until' do
     it 'should calculate the business days from the beginning of the month until the specified day' do
       Date.stub(today: Date.new(2013, 10, 1))

data/spec/report_spec.rb

@@ -52,7 +52,7 @@ describe Goal::Report do
         report += "| 200      | 121.74   | 12.22    |\n"
         report += "|--------------------------------|\n"
         report += "| Current time:  90.0\n"
-        report += "| Current money: 15000.45\n"
+        report += "| Current money: 15.000,45\n"
         report += "| Current rate:  6.43\n"
         report += "| Days left:     9"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mateus Lorandi dos Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-freshbooks
@@ -112,8 +112,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Keep track of your hour goals
 test_files: []
+has_rdoc: