gpuzzletime 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25d45d4c0242828b4e577bc2273a0c7a5813d33a65ab8760f0c08795d51340ff
-  data.tar.gz: fdcea7b3498c360fc80f91da9f6bbb39ec45d365f01c72c2f40e86bfae251e34
+  metadata.gz: 770445fa339c64739dcfbff341b410757cf80b54c1340688f21bedf04ebf6ba3
+  data.tar.gz: d527556a32fd3e722caeaed3001b254d08cc2e77df05f9f91968efa5cd23d919
 SHA512:
-  metadata.gz: c32b7c7b65f50769a852e728f3bcc15f5cf585ac530b5ba8c8436787510f31349b22302d644405ee505a90f4b8969c21727f4e5829ea113d9bd0b74da05991f1
-  data.tar.gz: cb3cf7c061d46a3a9b60a7aab3df4a7859d31f7ab36994749593e1a430d94ba15abf780de0ceac051b1fee792c3e96c20c1316919367b2090df1919d9c488940
+  metadata.gz: 2114fb4d188c30c11cbb260e6e64c501ba43352a5b26ca52248a76aa4e806eff62a53f34c7070860a2af1baa130569e6bbce9196204145a46b3eb1f33937e6fe
+  data.tar.gz: 22eabdb94e69f3813f6f43987beec3500ab1370ae36bb72048121b24acd0b7ea49a34fe88d380bf624d13f862c1b84c34f15e16a03be971f361518a7b5da1c43

data/README.md

@@ -32,7 +32,7 @@ small tooling to transfer timelog-entries from gtimelog's timelog.txt to the Puz
     - [ ] with a dedicated cli?
     - [ ] from a REST-Endpoint of PTime?
   - [ ] automatically prefill billable
-    - [ ] from time-accounts
+    - [x] from time-accounts
     - [ ] from *-notation
   - [ ] allow to have a list of "favourite" time-accounts
   - [ ] select best-matching time-account according to tags, possibly limited to the favourites

data/lib/gpuzzletime/app.rb

@@ -116,13 +116,15 @@ module Gpuzzletime
     end
 
     def url_options(start, entry)
+      account = infer_account(entry)
       {
         work_date:                    entry[:date],
         'ordertime[ticket]':          entry[:ticket],
         'ordertime[description]':     entry[:description],
         'ordertime[from_start_time]': start,
         'ordertime[to_end_time]':     entry[:time],
-        'ordertime[account_id]':      infer_account(entry),
+        'ordertime[account_id]':      account,
+        'ordertime[billable]':        infer_billable(account),
       }
         .map { |key, value| [key, ERB::Util.url_encode(value)].join('=') }
         .join('&')
@@ -181,5 +183,13 @@ module Gpuzzletime
       cmd = %(#{parser} "#{entry[:ticket]}" "#{entry[:description]}" #{tags.map(&:inspect).join(' ')})
       `#{cmd}`.chomp # maybe only execute if parser is in correct dir?
     end
+
+    def infer_billable(account)
+      script = Pathname.new('~/.config/gpuzzletime/billable').expand_path
+
+      return 1 unless script.exist?
+
+      `#{script} #{account}`.chomp == 'true' ? 1 : 0
+    end
   end
 end

data/lib/gpuzzletime/version.rb

@@ -2,5 +2,5 @@
 
 # Version
 module Gpuzzletime
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gpuzzletime
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Matthias Viehweger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler