sredder 0.0.5 → 0.0.6

data/lib/sredder/arg_parser.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'optparse/time'
+require 'debugger'
 
 module Sredder
   class ArgParser
@@ -17,8 +18,7 @@ module Sredder
     end
 
     def valid?
-      ( options[:date]    &&
-        options[:title]   &&
+      ( options[:title]   &&
         options[:message] &&
         options[:hours]
       ) || (

data/lib/sredder/github_auth.rb

@@ -1,6 +1,5 @@
 require 'oauth'
 require 'forwardable'
-require 'debugger'
 
 module Sredder
 

data/lib/sredder/util.rb

@@ -2,9 +2,12 @@ module Sredder
 
   module Util
 
-    # Wrike expects this "yyyy-MM-dd'T'HH:mm.ss"
+    ### Old: Wrike expects this "yyyy-MM-dd'T'HH:mm.ss"
+    ### time.strftime('%Y-%m-%d %R.00')
+    #
+    # Wrike expects this "yyyy-MM-dd"
     def self.time_stamp(time = Time.now)
-      time.strftime('%Y-%m-%d %R.00')
+      time.strftime('%Y-%m-%d')
     end
 
     # just block execution until the user hits ENTER
@@ -15,4 +18,4 @@ module Sredder
 
   end
 
-end
+end

data/lib/sredder/version.rb

@@ -1,3 +1,3 @@
 module Sredder
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/sredder/wrike_auth.rb

@@ -1,6 +1,5 @@
 require 'oauth'
 require 'forwardable'
-require 'debugger'
 
 module Sredder
 

data/lib/sredder.rb

@@ -6,9 +6,12 @@ require "sredder/wrike_auth"
 require "sredder/wrike_request"
 require "sredder/github_auth"
 require "sredder/github_request"
+require 'debugger'
 
 module Sredder
 
+  # When debugging, comment out the validate! call and use something like...
+  # > Sredder.run_command(['-t Hello', '-m Message', '-h3'])
   def self.run_command(argv)
     args_parser = ArgParser.new
     args_parser.parse(argv)
@@ -42,13 +45,13 @@ module Sredder
     request = WrikeRequest.new(access)
     request.post('/api/json/v2/wrike.folder.tree', {})
     regex = Regexp.new(Regexp.escape("SRED Time Tracking/#{folder}"))
-    if request.success?
+
+    if request.json["error"]
+      puts request.json["error"]
+    else
       request.json["foldersTree"]["folders"].each_with_object([]) do |folder, arr|
         arr << folder['id'].to_i if folder['fullPath'] =~ regex
       end
-    else
-      puts request.json
-      puts 'Invalid response from Wrike'
     end
   end
 
@@ -61,18 +64,34 @@ module Sredder
       status: 1,
       parents: parent_folder_ids
     })
-    request.json["task"]["id"] if request.success?
+
+    if request.json["error"]
+      puts "#{request.json["error"]["code"]}: #{request.json["error"]["message"]}"
+    else
+      puts "Task Entry #: #{request.json["task"]["id"]}"
+      puts "Title: #{request.json["task"]["title"]}"
+      puts "Message: #{request.json["task"]["description"]}"
+      request.json["task"]["id"]
+    end
   end
 
   # Attaches a timelog entry to a Wrike task
   def self.create_timelog(access, date, task_id, hours, comment='')
     request = WrikeRequest.new(access)
+
     request.post('/api/json/v2/wrike.timelog.add', {
       date: date,
       taskId: task_id,
       hours: hours,
       comment: comment
     })
+
+    if request.json["error"]
+      puts "#{request.json["error"]["code"]}: #{request.json["error"]["message"]}"
+    else
+      puts "Timelog Entry #: #{request.json["timelog"]["id"]}"
+      puts "On #{request.json["timelog"]["date"]} for #{request.json["timelog"]["hours"]} hours with comment: '#{request.json["timelog"]["comment"]}'"
+    end
   end
 
   ### Github
@@ -84,7 +103,8 @@ module Sredder
     request.get("https://api.github.com/repos/cloudClinic/cloudClinic-Server/pulls/#{options[:github_id]}")
 
     options[:title] = request.json["title"]
-    options[:message] = request.json["body"]
+    options[:message] = request.json["body"].gsub("\n", "<br>")
+    options[:date] = Util.time_stamp(Time.parse(request.json["created_at"]))
 
     options
   end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-# require 'debugger'
 
 RSpec.configure do |config|
   config.before :all do

metadata

@@ -2,14 +2,14 @@
 name: sredder
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Matthew Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement