freshtrack 0.4.2 → 0.5.0

data/History.txt

@@ -1,3 +1,8 @@
+== 0.5.0 2011-03-28
+
+* 1 minor enhancement:
+  * Allowing Freshbooks API credentials to appear at a per-project level
+
 == 0.4.2 2009-08-02
 
 * 1 tiny enhancement:

data/Rakefile

@@ -1,4 +1,51 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+require 'rubygems'
+#require 'bundler'
+#begin
+#  Bundler.setup(:default, :development)
+#rescue Bundler::BundlerError => e
+#  $stderr.puts e.message
+#  $stderr.puts "Run `bundle install` to install missing gems"
+#  exit e.status_code
+#end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "freshtrack"
+  gem.homepage = "http://github.com/flogic/freshtrack"
+  gem.license = "MIT"
+  gem.summary = %Q{Track your time on FreshBooks}
+  gem.email = "ymendel@pobox.com"
+  gem.authors = ["Yossef Mendelssohn"]
+  gem.add_runtime_dependency 'freshbooks', '= 2.1'
+  gem.add_development_dependency 'bacon', '>= 1.1.0'
+  gem.add_development_dependency 'facon', '>= 0.4.1'
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+#require 'rcov/rcovtask'
+#Rcov::RcovTask.new do |test|
+#  test.libs << 'test'
+#  test.pattern = 'test/**/test_*.rb'
+#  test.verbose = true
+#end
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "freshtrack #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.5.0

data/bin/freshtrack

@@ -42,8 +42,10 @@ BANNER
   end
 end
 
+project = ARGV.shift
+
 if aging
-  Freshtrack.init
+  Freshtrack.init(project)
   aging = Freshtrack.invoice_aging
   printf "%-8s  %-40s  %-5s  %-6s  %8s  %8s\n", 'Invoice', 'Client', 'Age', 'Status', 'Amount', 'Owed'
   printf "%s\n", '-' * 86
@@ -53,12 +55,10 @@ if aging
   exit
 end
 
-project = ARGV.shift
-
 unless project
   puts "Usage: #{File.basename($0)} [project] [options]"
   exit
 end
 
-Freshtrack.init
+Freshtrack.init(project)
 Freshtrack.track(project, OPTIONS)

data/config/hoe.rb

@@ -11,8 +11,8 @@ EXTRA_DEPENDENCIES = [
   ['freshbooks', '= 2.1']
 ]    # An array of rubygem dependencies [name, version]
 EXTRA_DEV_DEPENDENCIES = [
-  ['rspec', '>= 1.1.4'],
-  ['mocha', '>= 0.9.1']
+  ['bacon', '>= 1.1.0'],
+  ['facon', '>= 0.4.1']
 ]    # An array of rubygem dependencies [name, version]
 
 @config_file = "~/.rubyforge/user-config.yml"

data/lib/freshtrack/version.rb

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

data/lib/freshtrack.rb

@@ -5,10 +5,11 @@ require 'yaml'
 
 module Freshtrack
   class << self
-    attr_reader :config, :project, :task
+    attr_reader :config, :project_name, :project, :task
     
-    def init
+    def init(project = nil)
       load_config
+      @project_name = project
       FreshBooks.setup("#{company}.freshbooks.com", token)
     end
     
@@ -17,13 +18,21 @@ module Freshtrack
     end
     
     def company
-      config['company']
+      project_info_value('company')
     end
     
     def token
-      config['token']
+      project_info_value('token')
     end
     
+    def project_info_value(key)
+      return config[key.to_s] unless project_name
+      info = project_task_mapping[project_name]
+      return config[key.to_s] unless info[:company] and info[:token]
+      info[key.to_sym]
+    end
+    private :project_info_value
+    
     def project_task_mapping
       config['project_task_mapping']
     end

data/spec/core_ext/array_spec.rb

@@ -2,24 +2,24 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe Array do
   it 'should be groupable' do
-    Array.new.should respond_to(:group_by)
+    Array.new.should.respond_to(:group_by)
   end
   
   describe 'when grouping' do
-    before :each do
+    before do
       @array = (1..10).to_a
     end
     
     it 'should require a block' do
-      lambda { @array.group_by }.should raise_error(ArgumentError)
+      lambda { @array.group_by }.should.raise(ArgumentError)
     end
     
     it 'should accept a block' do
-      lambda { @array.group_by {} }.should_not raise_error(ArgumentError)
+      lambda { @array.group_by {} }.should.not.raise(ArgumentError)
     end
     
     it 'should return a hash' do
-      @array.group_by {}.should be_kind_of(Hash)
+      @array.group_by {}.should.be.kind_of(Hash)
     end
     
     it 'should group the elements by the return value of the block' do

data/spec/core_ext/numeric_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe Integer do
   it 'should be convertible from seconds to hours' do
-    90.should respond_to(:secs_to_hours)
+    90.should.respond_to(:secs_to_hours)
   end
   
   it 'should return this number of seconds as an amount of hours' do
@@ -12,7 +12,7 @@ end
 
 describe Float do
   it 'should be convertible from seconds to hours' do
-    90.0.should respond_to(:secs_to_hours)
+    90.0.should.respond_to(:secs_to_hours)
   end
   
   it 'should return this number of seconds as an amount of hours' do

data/spec/core_ext/time_spec.rb

@@ -2,17 +2,17 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe Time do
   it 'should be convertible to date' do
-    Time.now.should respond_to(:to_date)
+    Time.now.should.respond_to(:to_date)
   end
   
   describe 'when converting to date' do
-    before :each do
+    before do
       @time = Time.now
       @date = @time.to_date
     end
     
     it 'should return a date' do
-      @date.should be_kind_of(Date)
+      @date.should.be.kind_of(Date)
     end
     
     it 'should return an date with matching year' do

data/spec/freshbooks/base_object_spec.rb

@@ -5,17 +5,17 @@ ThingDeal = FreshBooks::BaseObject.new(:attr)
 
 describe FreshBooks::BaseObject do
   it 'should have a mapping function for Date' do
-    FreshBooks::BaseObject::MAPPING_FNS[Date].should respond_to(:call)
+    FreshBooks::BaseObject::MAPPING_FNS[Date].should.respond_to(:call)
   end
   
   describe 'Date mapping function' do
-    before :each do
+    before do
       @func = FreshBooks::BaseObject::MAPPING_FNS[Date]
-      @date = stub('date arg', :text => '2008-01-29')
+      @date = mock('date arg', :text => '2008-01-29')
     end
     
     it 'should return a date' do
-      @func.call(@date).should be_kind_of(Date)
+      @func.call(@date).should.be.kind_of(Date)
     end
     
     it 'should return a date matching the text of its argument' do
@@ -24,18 +24,18 @@ describe FreshBooks::BaseObject do
   end
   
   describe 'converting an instance to XML' do
-    before :each do
+    before do
       @thing = Thing.new
     end
     
     it 'should use the elem name' do
-      @thing.expects(:elem_name)
+      @thing.should.receive(:elem_name)
       @thing.to_xml
     end
   end
   
   describe 'getting the elem name' do
-    before :each do
+    before do
       @thing = Thing.new
       @thing_deal = ThingDeal.new
     end

data/spec/freshbooks/invoice_spec.rb

@@ -1,34 +1,34 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe FreshBooks::Invoice do
-  before :each do
+  before do
     @invoice = FreshBooks::Invoice.new
   end
   
   describe 'attributes' do
     it 'should have an invoice_id' do
-      @invoice.should respond_to(:invoice_id)
+      @invoice.should.respond_to(:invoice_id)
     end
     
     it 'should have a client_id' do
-      @invoice.should respond_to(:client_id)
+      @invoice.should.respond_to(:client_id)
     end
     
     it 'should have a date' do
-      @invoice.should respond_to(:date)
+      @invoice.should.respond_to(:date)
     end
     
     it 'should have a status' do
-      @invoice.should respond_to(:status)
+      @invoice.should.respond_to(:status)
     end
     
     it 'should have an amount' do
-      @invoice.should respond_to(:amount)
+      @invoice.should.respond_to(:amount)
     end
   end
   
   describe 'type mappings' do
-    before :each do
+    before do
       @mapping = FreshBooks::Invoice::TYPE_MAPPINGS
     end
     
@@ -46,53 +46,53 @@ describe FreshBooks::Invoice do
   end
   
   it 'should indicate open status' do
-    @invoice.should respond_to(:open?)
+    @invoice.should.respond_to(:open?)
   end
   
   describe 'indicating open status' do
     it "should be false if the status is 'draft'" do
       @invoice.status = 'draft'
-      @invoice.should_not be_open
+      @invoice.should.not.be.open
     end
     
     it "should be true if the status is 'sent'" do
       @invoice.status = 'sent'
-      @invoice.should be_open
+      @invoice.should.be.open
     end
     
     it "should be true if the status is 'viewed'" do
       @invoice.status = 'viewed'
-      @invoice.should be_open
+      @invoice.should.be.open
     end
     
     it "should be false if the status is 'paid'" do
       @invoice.status = 'paid'
-      @invoice.should_not be_open
+      @invoice.should.not.be.open
     end
     
     it "should be true if the status is 'partial'" do
       @invoice.status = 'partial'
-      @invoice.should be_open
+      @invoice.should.be.open
     end
   end
   
   it 'should have a client' do
-    @invoice.should respond_to(:client)
+    @invoice.should.respond_to(:client)
   end
   
   describe 'client' do
     it 'should find client based on client_id' do
-      client_id = stub('client ID')
-      @invoice.stubs(:client_id).returns(client_id)
-      FreshBooks::Client.expects(:get).with(client_id)
+      client_id = mock('client ID')
+      @invoice.stub!(:client_id).and_return(client_id)
+      FreshBooks::Client.should.receive(:get).with(client_id)
       @invoice.client
     end
     
     it 'should return found client' do
-      client = stub('client')
-      client_id = stub('client ID')
-      @invoice.stubs(:client_id).returns(client_id)
-      FreshBooks::Client.expects(:get).with(client_id).returns(client)
+      client = mock('client')
+      client_id = mock('client ID')
+      @invoice.stub!(:client_id).and_return(client_id)
+      FreshBooks::Client.should.receive(:get).with(client_id).and_return(client)
       @invoice.client.should == client
     end
   end
@@ -114,12 +114,12 @@ describe FreshBooks::Invoice do
     end
     
     it 'should show up in the members list' do
-      FreshBooks::Invoice.members.should include('number')
+      FreshBooks::Invoice.members.should.include('number')
     end
   end
   
   it 'should still have important core behavior' do
-    FreshBooks::Invoice.should respond_to(:list)
+    FreshBooks::Invoice.should.respond_to(:list)
   end
   
   it 'should still be a type of BaseObject' do
@@ -128,10 +128,10 @@ describe FreshBooks::Invoice do
   
   it 'should still have other fields in the members list' do
     members = FreshBooks::Invoice.members
-    members.should include('invoice_id')
-    members.should include('client_id')
-    members.should include('status')
-    members.should include('date')
+    members.should.include('invoice_id')
+    members.should.include('client_id')
+    members.should.include('status')
+    members.should.include('date')
   end
   
   it 'should still allow other fields to be set and get using []' do
@@ -143,23 +143,23 @@ describe FreshBooks::Invoice do
   end
   
   it 'should have payments' do
-    @invoice.should respond_to(:payments)
+    @invoice.should.respond_to(:payments)
   end
   
   describe 'payments' do
-    before :each do
-      @payments = Array.new(3) { stub('payment') }
-      FreshBooks::Payment.stubs(:list).returns(@payments)
+    before do
+      @payments = Array.new(3) { mock('payment') }
+      FreshBooks::Payment.stub!(:list).and_return(@payments)
     end
     
     it 'should get a list from Payment' do
-      FreshBooks::Payment.expects(:list)
+      FreshBooks::Payment.should.receive(:list)
       @invoice.payments
     end
     
     it 'should pass the invoice_id when getting the list' do
       @invoice.invoice_id = '0000073'
-      FreshBooks::Payment.expects(:list).with('invoice_id' => @invoice.invoice_id)
+      FreshBooks::Payment.should.receive(:list).with('invoice_id' => @invoice.invoice_id)
       @invoice.payments
     end
     
@@ -168,36 +168,36 @@ describe FreshBooks::Invoice do
     end
     
     it 'should return an empty array if Payment returns nil' do
-      FreshBooks::Payment.stubs(:list).returns(nil)
+      FreshBooks::Payment.stub!(:list).and_return(nil)
       @invoice.payments.should == []
     end
   end
   
   it 'should have a paid amount' do
-    @invoice.should respond_to(:paid_amount)
+    @invoice.should.respond_to(:paid_amount)
   end
   
   describe 'paid amount' do
     it 'should be the sum of payment amounts' do
-      payments = [stub('payment', :amount => 3), stub('payment', :amount => 15), stub('payment', :amount => 5)]
-      @invoice.stubs(:payments).returns(payments)
+      payments = [mock('payment', :amount => 3), mock('payment', :amount => 15), mock('payment', :amount => 5)]
+      @invoice.stub!(:payments).and_return(payments)
       @invoice.paid_amount.should == 23
     end
     
     it 'should be 0 if there are no payments' do
-      @invoice.stubs(:payments).returns([])
+      @invoice.stub!(:payments).and_return([])
       @invoice.paid_amount.should == 0
     end
   end
   
   it 'should have an owed amount' do
-    @invoice.should respond_to(:owed_amount)
+    @invoice.should.respond_to(:owed_amount)
   end
   
   describe 'owed amount' do
     it 'should be invoice amount less paid amount' do
       @invoice.amount = 60
-      @invoice.stubs(:paid_amount).returns(50)
+      @invoice.stub!(:paid_amount).and_return(50)
       @invoice.owed_amount.should == 10
     end
   end

data/spec/freshbooks/payment_spec.rb

@@ -1,22 +1,22 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe FreshBooks::Payment do
-  before :each do
+  before do
     @payment = FreshBooks::Payment.new
   end
   
   describe 'attributes' do
     it 'should have an invoice_id' do
-      @payment.should respond_to(:invoice_id)
+      @payment.should.respond_to(:invoice_id)
     end
     
     it 'should have an amount' do
-      @payment.should respond_to(:amount)
+      @payment.should.respond_to(:amount)
     end
   end
   
   describe 'type mappings' do
-    before :each do
+    before do
       @mapping = FreshBooks::Payment::TYPE_MAPPINGS
     end