88miles 1.0.5 → 1.0.6

data/88miles.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "88miles"
-  s.version = "1.0.5"
+  s.version = "1.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Myles Eftos"]
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.executables = ["88miles"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
+    "README.dev",
     "README.md"
   ]
   s.files = [

data/README.dev

@@ -0,0 +1 @@
+ENV=development bundle exec ruby -I"lib" bin/88miles -s ~/.88miles-dev start

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.6

data/lib/gigawatt/commands/init.rb

@@ -19,6 +19,9 @@ module Gigawatt
         rescue OAuth2::Error => e
           say "Access to your 88 Miles may have been revoked. Please run <%= color('88miles setup', BOLD) %> again."
           return INVALID_OAUTH_TOKEN_EXIT_CODE
+        rescue Faraday::Error::ConnectionFailed => e
+          say "Couldn't connect to the 88 Miles server. Please try again later."
+          return CONNECTION_ERROR_EXIT_CODE
         end
 
         return OK_EXIT_CODE

data/lib/gigawatt/commands/log.rb

@@ -25,6 +25,9 @@ options
         rescue OAuth2::Error => e
           say "Access to your 88 Miles may have been revoked. Please run <%= color('88miles setup', BOLD) %> again."
           return INVALID_OAUTH_TOKEN_EXIT_CODE
+        rescue Faraday::Error::ConnectionFailed => e
+          say "Couldn't connect to the 88 Miles server. Please try again later."
+          return CONNECTION_ERROR_EXIT_CODE
         end
       end
 

data/lib/gigawatt/commands/setup.rb

@@ -34,6 +34,9 @@ options:
         rescue OAuth2::Error => e
           puts "There was an issue authenticating your account. Please try again."
           return INVALID_OAUTH_TOKEN_EXIT_CODE
+        rescue Faraday::Error::ConnectionFailed => e
+          say "Couldn't connect to the 88 Miles server. Please try again later."
+          return CONNECTION_ERROR_EXIT_CODE
         end
         instance.postamble
 

data/lib/gigawatt/commands/start.rb

@@ -26,6 +26,9 @@ options:
         rescue OAuth2::Error => e
           say "Access to your 88 Miles may have been revoked. Please run <%= color('88miles setup', BOLD) %> again."
           return INVALID_OAUTH_TOKEN_EXIT_CODE
+        rescue Faraday::Error::ConnectionFailed => e
+          say "Couldn't connect to the 88 Miles server. Please try again later."
+          return CONNECTION_ERROR_EXIT_CODE
         end
       end
 

data/lib/gigawatt/commands/stop.rb

@@ -25,6 +25,9 @@ options:
         rescue OAuth2::Error => e
           say "Access to your 88 Miles may have been revoked. Please run <%= color('88miles setup', BOLD) %> again."
           return INVALID_OAUTH_TOKEN_EXIT_CODE
+        rescue Faraday::Error::ConnectionFailed => e
+          say "Couldn't connect to the 88 Miles server. Please try again later."
+          return CONNECTION_ERROR_EXIT_CODE
         end
       end
 
@@ -40,18 +43,28 @@ options:
         project = Gigawatt::ProjectFile.new.project
 
         if project
+          running_total = (Time.now.to_i - project["started_at"])
           response = JSON.parse(@access_key.post("/api/1/projects/#{project["uuid"]}/punch_out.json", { :params => { :notes => options.notes.to_s } }).body)
           current = response["response"]
           ProjectFile.write(current)
 
           company = @cache.companies(true)[project["company_uuid"]]
-          say("Punched out of #{company["name"]}: #{project["name"]}")
+          say("Punched out of #{company["name"]}: #{project["name"]}. Shift time: #{to_clock_s(running_total, true)}.")
           return OK_EXIT_CODE
         else
           say("No project found. Did you remember to run <%= color('88miles init [directory]', BOLD) %>?")
           return NO_PROJECT_EXIT_CODE
         end
       end
+
+      def to_clock_s(time, show_seconds = false)
+        hour = (time.abs / 3600).floor
+        minute = (time.abs / 60 % 60).floor
+        seconds = (time.abs % 60).floor if show_seconds
+
+        return (time != 0 && (time / time.abs) == -1 ? "-" : "") + hour.to_s.rjust(2, '0') + ":" + minute.to_s.rjust(2, '0') + (show_seconds ? ":" + seconds.to_s.rjust(2, '0') : '')
+      end
+
     end
   end
 end

data/lib/gigawatt/commands/sync.rb

@@ -25,6 +25,9 @@ Usage
         rescue OAuth2::Error => e
           say "Access to your 88 Miles may have been revoked. Please run <%= color('88miles setup', BOLD) %> again."
           return INVALID_OAUTH_TOKEN_EXIT_CODE
+        rescue Faraday::Error::ConnectionFailed => e
+          say "Couldn't connect to the 88 Miles server. Please try again later."
+          return CONNECTION_ERROR_EXIT_CODE
         end
 
         return 0

data/lib/gigawatt/settings.rb

@@ -3,7 +3,7 @@ module Gigawatt
     attr_accessor :access_key, :projects, :companies, :staff
 
     def initialize(options = {})
-      @options = Settings.defaults.merge(options)
+      @options = Settings.defaults.merge({ :path => options[:settings] })
       read if setup?
     end
 

data/lib/gigawatt.rb

@@ -22,6 +22,7 @@ require File.join(File.dirname(__FILE__), 'gigawatt', 'commands', 'status')
 require File.join(File.dirname(__FILE__), 'gigawatt', 'commands', 'log')
 
 module Gigawatt
+  CONNECTION_ERROR_EXIT_CODE = 4
   NO_PROJECT_EXIT_CODE = 3
   SETTINGS_FILE_EXISTS = 2
   INVALID_OAUTH_TOKEN_EXIT_CODE = 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: 88miles
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70353334962340 !ruby/object:Gem::Requirement
+  requirement: &70269939633820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70353334962340
+  version_requirements: *70269939633820
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70353334961300 !ruby/object:Gem::Requirement
+  requirement: &70269939632660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.19
   type: :runtime
   prerelease: false
-  version_requirements: *70353334961300
+  version_requirements: *70269939632660
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &70353334960220 !ruby/object:Gem::Requirement
+  requirement: &70269939631680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2i
   type: :runtime
   prerelease: false
-  version_requirements: *70353334960220
+  version_requirements: *70269939631680
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70353334975200 !ruby/object:Gem::Requirement
+  requirement: &70269939630920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70353334975200
+  version_requirements: *70269939630920
 - !ruby/object:Gem::Dependency
   name: terminal-table
-  requirement: &70353334973620 !ruby/object:Gem::Requirement
+  requirement: &70269939646400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.4.5
   type: :runtime
   prerelease: false
-  version_requirements: *70353334973620
+  version_requirements: *70269939646400
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70353334971800 !ruby/object:Gem::Requirement
+  requirement: &70269939643680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70353334971800
+  version_requirements: *70269939643680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70353334970920 !ruby/object:Gem::Requirement
+  requirement: &70269939652600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70353334970920
+  version_requirements: *70269939652600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70353334969980 !ruby/object:Gem::Requirement
+  requirement: &70269939650880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70353334969980
+  version_requirements: *70269939650880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70353334992600 !ruby/object:Gem::Requirement
+  requirement: &70269939648640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 1.8.7
   type: :development
   prerelease: false
-  version_requirements: *70353334992600
+  version_requirements: *70269939648640
 description: 88 Miles (http://88miles.net) is simple time tracking for freelance developers,
   designers and copywriters. This gem allows you to access your account from your
   command line.
@@ -119,6 +119,7 @@ executables:
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
+- README.dev
 - README.md
 files:
 - .document
@@ -147,6 +148,7 @@ files:
 - lib/gigawatt/settings.rb
 - test/helper.rb
 - test/test_gigawatt.rb
+- README.dev
 homepage: http://github.com/88miles/gigawatt
 licenses:
 - MIT
@@ -162,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4216107371296387972
+      hash: 1777984718198463116
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: