mytime 0.0.2 → 0.0.3

data/README.md

@@ -18,13 +18,31 @@ Or install it yourself as:
 
 ## Usage
 
+  To link to your Freshbooks account (you will need your Freshbooks username and API token):
+  
+    $ mytime setup
+
+  To initialize mytime in a project directory:
+  
+    $ mytime init
+
+  To see project details:
+  
+    $ mytime project
+
   To list log:
 
-    $ mytime
+    $ mytime status
+
+  To submit custom time entry:
 
-  To submit project time:
+    $ mytime commit [hrs] [custom_message]
+    $ mytime commit  1.5 "Add an additional note if desired"
 
-    $ mytime commit "Add an additional note if desired"
+  To push your git logs from today for a given project:
+  
+    $ mytime push [hrs]
+    $ mytime push 4.5
 
 ## Contributing
 

data/lib/mytime.rb

@@ -1,5 +1,6 @@
 require "mytime/version"
 require "mytime/setup"
+require "mytime/config"
 require "mytime/client"
 require "mytime/timesheet"
 require 'ruby-freshbooks'
@@ -36,7 +37,7 @@ module Mytime
         push(args.first)
       when :project, :detail, :info
         puts "Project Details:"
-        puts config_details(Dir.pwd).to_yaml
+        puts Config.details(Dir.pwd).to_yaml
       when :debug
         puts init?
       else
@@ -44,54 +45,14 @@ module Mytime
       end
     end
 
-    # Save a .mytime config file. Overwrites any existing data
-    # 
-    # Options:
-    #   contents: Required hash of account data to save
-    #
-    def save(contents)
-      File.open(USER_FILE, 'a') do |file|
-        file.write contents.to_yaml
-      end
-    end
-
-    # Add yaml data to the existing .mytime config file
-    #
-    # Options:
-    #   contents: Required hash of data to add to config file
-    #
-    def add(contents)
-      data = YAML.load_file USER_FILE
-      merged_data = data.merge(contents)
-      puts merged_data
-      File.open(USER_FILE, 'w') do |file|
-        file.write merged_data.to_yaml
-      end
-    end
-
-    # Return details of .mytime config file
-    #
-    def config_details(path = "")
-      return unless YAML.load_file(USER_FILE)
-      data = YAML.load_file USER_FILE
-      if path == ""
-        data
-      else
-        data.each do |d|
-          project = data.select{|key, hash| hash["project_path"] == path }
-          return project.first[1] if project.any?
-        end
-      end
-    end
-
     # Check if mytime is setup
     def setup?
-      config_details.has_key?("account")
+      Config.details.has_key?("account")
     end
 
     # Check if mytime is initialized for this project
     def init?
-      config_details(Dir.pwd).has_key?("project_id")
+      Config.details(Dir.pwd).has_key?("project_id")
     end
 
     def finish_setup

data/lib/mytime/client.rb

@@ -9,7 +9,7 @@ module Mytime
     #   project_id: Optional project_id to restrict data returned
     #
     def project(project_id = nil)
-      account = Mytime.config_details    
+      account = Config.details    
       c = FreshBooks::Client.new(account["account"], account["token"])
       if project_id.nil?
         c.project.list["projects"]
@@ -18,6 +18,16 @@ module Mytime
       end
     end
 
+    # Get task data from client API
+    #
+    # project_id: Required project_id to restrict data returned
+    #
+    def tasks(project_id)
+      account = Config.details    
+      c = FreshBooks::Client.new(account["account"], account["token"])
+      c.task.list :project_id => project_id
+    end
+
     # Submit new time entry to client API
     #
     # Option:
@@ -25,15 +35,16 @@ module Mytime
     #   message: Optional - message to send with time entry
     #
     def submit(hours, message = "")
-      account = Mytime.config_details
+
+      account = Config.details
       c = FreshBooks::Client.new(account["account"], account["token"])
-      project = Mytime.config_details(Dir.pwd)
+      project = Config.details(Dir.pwd)
       entry = c.time_entry.create(
         :time_entry => {
           project_id: project["project_id"],
           task_id: project["task_id"],
           hours: hours.to_f,
-          notes: message.to_s,
+          notes: message.gsub(/\n/,"\n\n").to_s,
           date: Date.today.to_s
         }
       )

data/lib/mytime/config.rb

@@ -0,0 +1,59 @@
+module Mytime
+
+  module Config
+    extend self
+
+    # Return details of .mytime config file
+    #
+    def details(path = "")
+      begin
+        data = YAML.load_file USER_FILE
+        if path == ""
+          data
+        else
+          data.each do |d|
+            project = data.select{|key, hash| hash["project_path"] == path }
+            return project.first[1] if project.any?
+          end
+        end
+      rescue Exception => e
+        {}
+      end
+    end
+
+    # Save a .mytime config file. Overwrites any existing data
+    # 
+    # Options:
+    #   contents: Required hash of account data to save
+    #
+    def save(contents)
+      begin
+        File.open(USER_FILE, 'a') do |file|
+          file.write contents.to_yaml
+        end
+      rescue
+        puts "Failed saving information! Please try again."
+      end
+    end
+
+    # Add yaml data to the existing .mytime config file
+    #
+    # Options:
+    #   contents: Required hash of data to add to config file
+    #
+    def add(contents)
+      begin
+        data = YAML.load_file USER_FILE
+        merged_data = data.merge(contents)
+        puts merged_data
+        File.open(USER_FILE, 'w') do |file|
+          file.write merged_data.to_yaml
+        end
+      rescue
+        puts "Failed adding data. Please try again."
+      end
+    end
+
+  end
+
+end

data/lib/mytime/setup.rb

@@ -12,7 +12,7 @@ module Mytime
     account = Hash.new
     account["account"] = "#{account_name}.freshbooks.com"
     account["token"] = token
-    self.save(account)
+    Config.save(account)
   end
 
   # Setup .mytime file to include project specific data
@@ -25,14 +25,18 @@ module Mytime
     end
     project_id = STDIN.gets.chomp
 
-    project = Client.project(project_id)["project"]
-    task_id = project["tasks"]["task"][0]["task_id"]
+    puts "Choose Task"
+    tasks = Client.tasks(project_id)['tasks']['task']
+    tasks.each do |task|
+      puts "#{task['task_id']}: #{task['name']}"
+    end
+    task_id = STDIN.gets.chomp
 
     project_details = Hash.new{|h,k| h[k]=Hash.new(&h.default_proc)}
     project_details[project_id]["project_path"] = Dir.pwd
     project_details[project_id]["project_id"] = project_id
     project_details[project_id]["task_id"] = task_id
-    self.add(project_details)
+    Config.add(project_details)
   end
 
   # Set configuration variables to values passed in the command line options

data/lib/mytime/timesheet.rb

@@ -28,6 +28,10 @@ module Mytime
   #
   def push(hours)
     return finish_setup unless setup? && init?
+    if hours.nil?
+      puts "How many hours did you spend on these commits?"
+      hours = STDIN.gets.chomp
+    end
     puts Client.submit(hours, status)
   end
 

data/lib/mytime/version.rb

@@ -1,3 +1,3 @@
 module Mytime
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/helper.rb

@@ -0,0 +1,8 @@
+require 'minitest/autorun'
+require 'minitest/pride'
+require 'awesome_print'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'mytime'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mytime
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-freshbooks
@@ -43,10 +43,12 @@ files:
 - bin/mytime
 - lib/mytime.rb
 - lib/mytime/client.rb
+- lib/mytime/config.rb
 - lib/mytime/setup.rb
 - lib/mytime/timesheet.rb
 - lib/mytime/version.rb
 - mytime.gemspec
+- test/helper.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -72,4 +74,5 @@ signing_key:
 specification_version: 3
 summary: MyTime is a simple command line utility for submitting git commit history
   to a timesheet. Powered by the Freshbooks API.
-test_files: []
+test_files:
+- test/helper.rb