beggar 1.0.0 → 1.0.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    beggar (0.0.5.alpha)
+    beggar (1.0.0)
       httparty
 
 GEM

data/README.md

@@ -6,13 +6,10 @@ Beggar is a tool for generating time reports from your Basecamp account
 
 Example output:
 
-    78% || 140.0h, -12.0h || 5320.0 zł, -456.0 zł
-
-where
-
-    78% - working days progress in current month
-    140.0h, -12.0h - worked hours ratio
-    5320.0 zł, -456.0 zł - salary ratio
+    Current month
+    Weekdays:     78%
+    Worked hours: 140.0h (-12.0h)
+    Salary:       5320.0zł (-456.0zł)
 
 ### Installation
 
@@ -35,5 +32,6 @@ Example config:
     rate: 50.0
 
 ## Changelog
+  v1.0.1 - change output
   v1.0.0 - first stable release
 

data/lib/beggar/base.rb

@@ -8,19 +8,22 @@ module Beggar
     end
 
     def progress
-      "#{CurrentMonth.days_progression}%"
+      "#{CurrentMonth.weekdays_progression}%"
     end
 
     def worked_hours
-      "#{basecamp.worked_hours}h, #{ratio(basecamp.hours_ratio)}h"
+      "#{basecamp.worked_hours}h (#{ratio(basecamp.hours_ratio)}h)"
     end
 
     def salary
-      "#{as_money(basecamp.worked_hours)} zł, #{ratio(as_money(basecamp.hours_ratio))} zł"
+      "#{as_money(basecamp.worked_hours)}zł (#{ratio(as_money(basecamp.hours_ratio))}zł)"
     end
 
     def summary
-      [progress, worked_hours, salary].join(' || ')
+      %Q{Current month
+Weekdays:     #{progress}
+Worked hours: #{worked_hours}
+Salary:       #{salary}}
     end
 
   private

data/lib/beggar/basecamp.rb

@@ -12,12 +12,12 @@ module Beggar
     end
 
     def time_report(options = {})
-      options.merge!( subject_id: current_user )
-      get(%(/time_entries/report.xml#{params(options)}))
+      options.merge!(subject_id: current_user)
+      self.class.get("/time_entries/report.xml", :query => options)
     end
 
     def current_user
-      @current_user ||= get('/me.xml')['person']['id']
+      @current_user ||= self.class.get('/me.xml')['person']['id']
     end
 
     def current_month
@@ -33,15 +33,5 @@ module Beggar
     def hours_ratio
       CurrentMonth.weekday_hours_until_today - worked_hours
     end
-
-  private
-
-    def get(path)
-      self.class.get(path)
-    end
-
-    def params(options)
-      '?' + options.map { |name, value| "#{name}=#{value}" }.join('&')
-    end
   end
 end

data/lib/beggar/cli.rb

@@ -2,41 +2,42 @@ module Beggar
   class CLI
     class << self
       def run
-        begin
+        if File.exists?(config)
           $stdout.puts Base.new(Basecamp.new(load_config)).summary
-        rescue Errno::ENOENT
+        else
           create_config
           $stdout.puts "New config has been created in ~/.beggar"
           $stdout.puts "Please fill it with proper data."
-        rescue URI::InvalidURIError
-          $stdout.puts "Ensure that your config file is proper formatted!" 
         end
         exit 0
+      rescue URI::InvalidURIError
+        $stdout.puts "Ensure that your config file is proper formatted!"
+        exit 1
       end
 
-    private
+      private
 
-      def load_config
-        YAML.load_file(config)
-      end
+        def load_config
+          YAML.load_file(config)
+        end
 
-      def create_config
-        File.open(config, "w") do |output|
-          YAML.dump(defaults, output)
+        def create_config
+          File.open(config, "w") do |output|
+            YAML.dump(defaults, output)
+          end
         end
-      end
 
-      def defaults
-        {
-          "company" => "___",
-          "token" => "___",
-          "rate" => "___"
-        }
-      end
+        def defaults
+          {
+            "company" => "___",
+            "token" => "___",
+            "rate" => "___"
+          }
+        end
 
-      def config
-        "#{Dir.home}/.beggar"
-      end
+        def config
+          "#{Dir.home}/.beggar"
+        end
     end
   end
 end

data/lib/beggar/current_month.rb

@@ -17,7 +17,7 @@ module Beggar
         weekdays_until_today * 8.0
       end
 
-      def days_progression
+      def weekdays_progression
         (weekdays_until_today * 100.0 / weekdays).round
       end
 

data/lib/beggar/version.rb

@@ -1,4 +1,4 @@
 module Beggar
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end
 

data/spec/base_spec.rb

@@ -27,12 +27,12 @@ describe Beggar::Base do
       basecamp.stub(worked_hours: 136.0, hours_ratio: 32.0)
     end
 
-    it 'returns "136.0h, -32.0h"' do
-      base.worked_hours.should == "136.0h, -32.0h"
+    it 'returns "136.0h (-32.0h)"' do
+      base.worked_hours.should == "136.0h (-32.0h)"
     end
 
-    it 'returns "6800.0 zł, -1600.0 zł"' do
-      base.salary.should == "6800.0 zł, -1600.0 zł"
+    it 'returns "6800.0zł (-1600.0zł)"' do
+      base.salary.should == "6800.0zł (-1600.0zł)"
     end
   end
 
@@ -41,12 +41,12 @@ describe Beggar::Base do
       basecamp.stub(worked_hours: 176.0, hours_ratio: -8.0)
     end
 
-    it 'returns "176.0h, +8.0h"' do
-      base.worked_hours.should == "176.0h, +8.0h"
+    it 'returns "176.0h (+8.0h)"' do
+      base.worked_hours.should == "176.0h (+8.0h)"
     end
 
-    it 'returns "8800.0 zł, +$400.0 zł"' do
-      base.salary.should == "8800.0 zł, +400.0 zł"
+    it 'returns "8800.0zł (+$400.0zł)"' do
+      base.salary.should == "8800.0zł (+400.0zł)"
     end
   end
 
@@ -63,8 +63,11 @@ describe Beggar::Base do
   end
 
   it 'returns summary' do
-    base.stub(progress: "78%", worked_hours: "140.0h, -12.0h", salary: "5320.0 zł, -456.0 zł")
-    base.summary.should == "78% || 140.0h, -12.0h || 5320.0 zł, -456.0 zł"
+    base.stub(progress: "78%", worked_hours: "140.0h (-12.0h)", salary: "5320.0zł (-456.0zł)")
+    base.summary.should == %q{Current month
+Weekdays:     78%
+Worked hours: 140.0h (-12.0h)
+Salary:       5320.0zł (-456.0zł)}
   end
 end
 

data/spec/basecamp_spec.rb

@@ -23,21 +23,26 @@ describe Beggar::Basecamp do
   end
 
   it 'returns user id' do
-    response = { 'person' => { 'id' => 1 }}
+    response = {'person' => { 'id' => 1 }}
     basecamp.class.should_receive(:get).with('/me.xml').and_return(response)
     basecamp.current_user.should == 1
   end
 
   it 'returns time report for current user' do
     basecamp.stub(current_user: 1)
-    basecamp.class.should_receive(:get).with('/time_entries/report.xml?subject_id=1')
+    basecamp.class.should_receive(:get).with('/time_entries/report.xml', query: {subject_id: 1})
     basecamp.time_report
   end
 
   it 'returns time report for current month' do
-    Date.stub(today: Date.new(2012, 02, 17))
     basecamp.stub(current_user: 1)
-    basecamp.class.should_receive(:get).with('/time_entries/report.xml?from=2012-02-01&to=2012-02-17&subject_id=1')
+    basecamp.class.should_receive(:get).with('/time_entries/report.xml',
+      query: {
+        subject_id: 1,
+        from: Date.new(2012, 02, 01),
+        to: Date.new(2012, 02,17)
+      }
+    )
     basecamp.current_month
   end
 
@@ -58,12 +63,4 @@ describe Beggar::Basecamp do
     basecamp.stub(worked_hours: 96.0)
     basecamp.hours_ratio.should == 8.0
   end
-
-  describe 'private methods' do
-    it 'parses options to path params' do
-      basecamp.send(:params, { name: 'bob'}).should == '?name=bob'
-      basecamp.send(:params, { name: 'bob', surname: 'example'}).should == '?name=bob&surname=example'
-    end
-  end
 end
-

data/spec/cli_spec.rb

@@ -14,6 +14,10 @@ describe Beggar::CLI do
   end
 
   context 'when config file exists' do
+    before do
+      File.stub(:exists?).and_return(true)
+    end
+
     it "loads it before running" do
       YAML.should_receive(:load_file).with(config).and_return(double('configuration'))
     end
@@ -29,8 +33,9 @@ describe Beggar::CLI do
     }
 
     before do
-      YAML.should_receive(:load_file).with(config) { raise Errno::ENOENT }
+      File.stub(:exists?).and_return(false)
     end
+
     it "creates config with default settings" do
       output = double('output')
       File.should_receive(:open).with(config, "w").and_yield(output)
@@ -44,5 +49,13 @@ describe Beggar::CLI do
       $stdout.should_receive(:puts).with("Please fill it with proper data.")
     end
   end
+
+  context 'when config file is wrong' do
+    it 'displays notification' do
+      $stdout.unstub(:puts)
+      File.stub(:exists?) { raise URI::InvalidURIError }
+      $stdout.should_receive(:puts).with("Ensure that your config file is proper formatted!")
+    end
+  end
 end
 

data/spec/current_month_spec.rb

@@ -1,6 +1,5 @@
 require 'beggar'
 
-# FIXME add missing specs
 describe Beggar::CurrentMonth do
   let(:current_month) { Beggar::CurrentMonth }
 
@@ -8,6 +7,14 @@ describe Beggar::CurrentMonth do
     Date.stub(today: Date.new(2012, 2, 17))
   end
 
+  it 'returns weekdays' do
+    current_month.weekdays.should == 21
+  end
+
+  it 'returns weekdays until today' do
+    current_month.weekdays_until_today.should == 13
+  end
+
   it 'returns weekdays in hours' do
     current_month.weekday_hours.should == 168.0
   end
@@ -15,5 +22,34 @@ describe Beggar::CurrentMonth do
   it 'returns weekdays in hours until today' do
     current_month.weekday_hours_until_today.should == 104.0
   end
+
+  it 'returns weekdays progression' do
+    current_month.weekdays_progression.should == 62
+  end
+
+  it 'returns weekdays until date' do
+    date = Date.new(2012, 2, 23)
+    current_month.weekdays_until(date).should == 17
+  end
+
+  it 'returns first day of month' do
+    current_month.first_day.should == Date.new(2012, 2, 1)
+  end
+
+  it 'returns last day of month' do
+    current_month.last_day.should == Date.new(2012, 2, 29)
+  end
+
+  it 'returns year' do
+    current_month.year.should == 2012
+  end
+
+  it 'returns month' do
+    current_month.month.should == 2
+  end
+
+  it 'returns today' do
+    current_month.today.should == Date.new(2012, 2, 17)
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beggar
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-18 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70213892896680 !ruby/object:Gem::Requirement
+  requirement: &70364544025140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70213892896680
+  version_requirements: *70364544025140
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70213892895980 !ruby/object:Gem::Requirement
+  requirement: &70364544023600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213892895980
+  version_requirements: *70364544023600
 description: Tool for generating time reports from Basecamp. You can specify rate
   for each project and get value of your month salary.
 email: