jiraMule 0.1.2 → 0.3.0

data/lib/jiraMule/commands/logWork.rb

@@ -1,3 +1,4 @@
+require 'chronic'
 require 'chronic_duration'
 require 'date'
 require 'JiraMule/jiraUtils'
@@ -7,8 +8,10 @@ command :logwork do |c|
   c.summary = 'Log work spent'
   c.description = %{Log time spent on a issue}
   c.option '-m', '--message MSG', String, 'Message to add to work log'
-  c.option '--date DATE', String, 'When this work was done'
+  c.option '--date DATE', String, 'When this work was done.'
   c.example 'Log some work done on an issue', %{jm logwork BUG-42 1h 12m}
+  c.example 'Log work for a specific day', %{jm logwork BUG-42 1h --date 7-feb-2017}
+  c.example 'Log work for yesterday', %{jm logwork BUG-42 1h --date yesterday}
 
   c.action do |args, options|
     options.default :message => ''
@@ -18,17 +21,18 @@ command :logwork do |c|
     ts = ChronicDuration.parse(args.join(' '))
 
     unless options.date.nil? then
-      options.date = DateTime.parse(options.date)
-      if options.date.day_fraction.numerator == 0 then
-        # No time component. Need to add timezone...
-        offset = -(Time.now.gmt_offset/3600)
-        options.date += Rational(offset,24)
-      end
+      options.date = Chronic.parse(options.date)
+      raise "Invlaid --date" if options.date.nil?
+#      if options.date.day_fraction.numerator == 0 then
+#        # No time component. Need to add timezone...
+#        offset = -(Time.now.gmt_offset/3600)
+#        options.date += Rational(offset,24)
+#      end
     end
 
     begin
       jira.logWork(key, ts, options.message, options.date)
-    rescue JiraUtilsException => e
+    rescue JiraMule::JiraUtilsException => e
       pp e.response.body
     end
 

data/lib/jiraMule/http.rb

@@ -100,7 +100,7 @@ module JiraMule
           end
         else
           showHttpError(request, response)
-          raise response
+          #raise response
         end
       end
     end

data/lib/jiraMule/version.rb

@@ -1,3 +1,3 @@
 module JiraMule
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,195 +1,223 @@
 --- !ruby/object:Gem::Specification
 name: jiraMule
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.6
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.25.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.25.1
 - !ruby/object:Gem::Dependency
   name: mime-types-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2016'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2016'
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: vine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -208,7 +236,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -217,28 +245,26 @@ files:
 - bin/jm
 - jiraMule.gemspec
 - lib/JiraMule.rb
-- lib/JiraMule/Tempo.rb
+- lib/JiraMule/StyleLoader.rb
+- lib/JiraMule/commands.rb
 - lib/JiraMule/commands/assign.rb
-- lib/JiraMule/commands/githubImport.rb
+- lib/JiraMule/commands/kanban.rb
 - lib/JiraMule/commands/link.rb
-- lib/JiraMule/commands/timesheet.rb
+- lib/JiraMule/commands/open.rb
+- lib/JiraMule/commands/query.rb
+- lib/JiraMule/commands/statuses.rb
 - lib/JiraMule/gb.rb
+- lib/JiraMule/jiraUtils.rb
+- lib/JiraMule/renderMagic.rb
 - lib/jiraMule/Config.rb
 - lib/jiraMule/Passwords.rb
-- lib/jiraMule/commands.rb
 - lib/jiraMule/commands/attach.rb
 - lib/jiraMule/commands/config.rb
 - lib/jiraMule/commands/goto.rb
-- lib/jiraMule/commands/kanban.rb
 - lib/jiraMule/commands/logWork.rb
 - lib/jiraMule/commands/next.rb
-- lib/jiraMule/commands/progress.rb
-- lib/jiraMule/commands/query.rb
-- lib/jiraMule/commands/release.rb
-- lib/jiraMule/commands/testReady.rb
 - lib/jiraMule/gitUtils.rb
 - lib/jiraMule/http.rb
-- lib/jiraMule/jiraUtils.rb
 - lib/jiraMule/verbosing.rb
 - lib/jiraMule/version.rb
 homepage: ''
@@ -251,17 +277,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: A collection of things that I do with jira

data/lib/JiraMule/Tempo.rb

@@ -1,75 +0,0 @@
-require 'date'
-require 'json'
-require 'pp'
-require 'vine'
-require 'JiraMule/Config'
-require 'JiraMule/Passwords'
-require 'JiraMule/http'
-require 'JiraMule/verbosing'
-
-module JiraMule
-    class Tempo
-        include Verbose
-        include Http
-
-        def initialize()
-            acc = Account.new
-            up = acc.loginInfo
-            @username = up[:email]
-            @password = up[:password]
-        end
-        attr_reader :username, :password
-
-        def endPoint(path='')
-          URI($cfg['net.url'] + '/rest/tempo-timesheets/3/' + path.to_s)
-        end
-
-        # Get worklogs from Tempo plugin
-        def workLogs(username=@username, dateFrom=nil, dateTo=nil, project=nil)
-            q = {:username => username}
-            q[:dateFrom] = DateTime.parse(dateFrom).to_date.iso8601 unless dateFrom.nil?
-            q[:dateTo] = DateTime.parse(dateTo).to_date.iso8601 unless dateTo.nil?
-            q[:projectKey] = project unless project.nil?
-            #q[:accountKey]
-            #q[:teamId]
-
-            verbose "Fetching worklogs for #{q}"
-            get('worklogs', q)
-        end
-
-        ## Submit a timesheet for approval.
-        def submitForApproval(period=nil, name=@username, comment='')
-          if period.nil? then
-            # First day of work week
-            cur = currentApprovalStatus(nil, name)
-            period = cur.access 'period.dateFrom'
-          end
-          verbose "Submitting timesheet for #{period}"
-          post('timesheet-approval/', {
-            :user=>{
-              :name=>name,
-            },
-            :period=>{
-              :dateFrom=>period,
-            },
-            :action=>{
-              :name=>:submit,
-              :comment=>comment,
-            }
-          }) unless $cfg['tool.dry']
-        end
-
-        def currentApprovalStatus(period=nil, name=@username)
-          verbose "Getting current approval status; #{period} #{name}"
-          q = {
-            :username => name,
-          }
-          q[:periodStartDate] = period unless period.nil?
-
-          get('timesheet-approval/current/', q)
-        end
-    end
-
-end
-
-#  vim: set ai et sw=2 ts=2 :