sfctl 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30138753cd7927ab7010451f88efb8845d5f8b3034db46cefaafd15fc36c2795
-  data.tar.gz: 3be71cf7f62719cd3c56d82c1c4741872bf48c341f047c986756f8ec76c84277
+  metadata.gz: 36e137543a9eed8b4f2fd6c472fd5899d5dc94a3b98fd50d8ae527b79dd671b4
+  data.tar.gz: 2cb0c12ea7a79b7fefae5cbbffba604815a7a9629b002049530c165461d4a701
 SHA512:
-  metadata.gz: ed03923a889a0b07dcc31e155e54a67152b6b918f8f3e4eb3baac97e44f1cf1ed37ee6e633142076418d4bc2b4721eafe181fae01d712d8f43e49e2df2c75eb3
-  data.tar.gz: 22afbfcb272debee7d7d716ab80d8ea22a66da59316d0175932639134073eb0b1806a54cd026cf442f777561bc6da1f7386c54b1ef72e60fc2b7faeb1026b136
+  metadata.gz: f0e23db4406b9d253250398269a216a819e1a55afd11570f9515ab909e7b230b316cdbd8eedf28c910c78772e0aece324dc0adad1a4a0210b253b700a64e1df1
+  data.tar.gz: 292842c5de401507c927181a9c346e0a324a9944e5653fe4be752d8951dfc1bcac8e902d6e137eb0426ed0c6fa5636568fe2377a14361eb6a2d93d0a4c7a0d0a

data/Gemfile.lock

@@ -23,7 +23,7 @@ PATH
       tty-progressbar (~> 0.17.0)
       tty-prompt (~> 0.21.0)
       tty-reader (~> 0.7.0)
-      tty-screen (~> 0.7.1)
+      tty-screen (~> 0.8.1)
       tty-spinner (~> 0.9.3)
       tty-table (~> 0.11.0)
       tty-tree (~> 0.4.0)
@@ -34,12 +34,12 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
-    byebug (11.1.1)
-    coderay (1.1.2)
+    ast (2.4.1)
+    byebug (11.1.3)
+    coderay (1.1.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
+    diff-lcs (1.4.4)
     docile (1.3.2)
     equatable (0.6.1)
     faraday (1.0.1)
@@ -48,15 +48,14 @@ GEM
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     hashdiff (1.0.1)
-    jaro_winkler (1.5.4)
     kramdown (1.16.2)
     method_source (1.0.0)
     multipart-post (2.1.1)
     necromancer (0.5.1)
-    parallel (1.19.1)
-    parser (2.7.1.1)
-      ast (~> 2.4.0)
-    pastel (0.7.3)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pastel (0.7.4)
       equatable (~> 0.6)
       tty-color (~> 0.5)
     pry (0.13.1)
@@ -65,32 +64,36 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    public_suffix (4.0.4)
+    public_suffix (4.0.5)
     rainbow (3.0.0)
     rake (12.3.3)
+    regexp_parser (1.7.1)
     rexml (3.2.4)
-    rouge (3.18.0)
+    rouge (3.21.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.81.0)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.3)
+    rubocop (0.88.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.1.0)
+      parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
     simplecov (0.18.5)
@@ -151,7 +154,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
-    tty-screen (0.7.1)
+    tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     tty-table (0.11.0)

data/lib/sfctl/commands/time/connections/add.rb

@@ -90,7 +90,7 @@ module Sfctl
             @prompt.select('Rounding?', %w[on off])
           end
 
-          def setup_toggl_connection!(output, assignment_obj) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          def setup_toggl_connection!(output, assignment_obj) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
             spinner = ::TTY::Spinner.new('[:spinner] Loading ...')
 
             assignment_id = assignment_obj['id']
@@ -162,7 +162,7 @@ module Sfctl
             clear_conf_and_print_success!(output)
           end
 
-          def setup_harvest_connection!(output, assignment_obj) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          def setup_harvest_connection!(output, assignment_obj) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
             spinner = ::TTY::Spinner.new('[:spinner] Loading ...')
 
             assignment_id = assignment_obj['id']

data/lib/sfctl/commands/time/sync.rb

@@ -79,7 +79,7 @@ module Sfctl
           end
         end
 
-        def sync(output, assignment, connection) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        def sync(output, assignment, connection) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
           output.puts "Synchronizing: #{@pastel.cyan("[#{assignment['name']} / #{assignment['service']}]")}"
 
           success, next_report = Starfish::Client.next_report(@options['starfish-host'], access_token, assignment['id'])
@@ -92,7 +92,7 @@ module Sfctl
 
           print_report_contains_data(output, next_report) && return if touchy?(next_report)
 
-          uploading_to_starfish(output, assignment, time_entries, connection)
+          uploading_to_starfish(output, assignment, time_entries, connection) if time_entries.any?
         end
 
         def report_interval(record)

data/lib/sfctl/harvest/sync.rb

@@ -68,10 +68,13 @@ module Sfctl
       def self.assignment_items(time_entries, connection)
         hours_field = hours_field(connection['rounding'])
         time_entries.map do |te|
+          hours = te[hours_field]
+          time_seconds = hours * 60 * 60
           {
-            time: te[hours_field],
+            time_seconds: time_seconds.round,
             date: te['spent_date'].to_s,
-            comment: te['notes']
+            comment: te['notes'],
+            external_id: te['id'].to_s
           }
         end
       end

data/lib/sfctl/toggl/sync.rb

@@ -10,9 +10,14 @@ module Sfctl
         spinner = TTY::Spinner.new("Loaded data from #{Sfctl::Command::TOGGL_PROVIDER}: [:spinner]", format: :dots)
         spinner.auto_spin
 
-        time_entries = get_time_entries(connection, toggl_config, report_interval)
+        time_entries, error = get_time_entries(connection, toggl_config, report_interval)
 
-        spinner.success(pastel.green('Done'))
+        if error
+          spinner.error
+          output.puts pastel.red(error)
+        else
+          spinner.success(pastel.green('Done'))
+        end
 
         table = TTY::Table.new %w[Date Comment Time], time_entries_table_rows(time_entries)
         output.puts
@@ -38,14 +43,20 @@ module Sfctl
 
       def self.get_time_entries(connection, toggl_config, report_interval)
         entries_list = []
+        error = nil
 
         page = 1
         loop do
-          _success, body = Toggl::Client.time_entries(
+          success, body = Toggl::Client.time_entries(
             toggl_config['access_token'],
             time_entries_params(connection, report_interval, page)
           )
 
+          unless success
+            error = body.fetch('message', body)
+            break
+          end
+
           entries_list << body['data']
           entries_list.flatten!
           entries_list.compact!
@@ -55,7 +66,7 @@ module Sfctl
           page += 1
         end
 
-        entries_list
+        [entries_list, error]
       end
 
       def self.time_entries_params(connection, report_interval, page = 1)
@@ -93,10 +104,12 @@ module Sfctl
 
       def self.assignment_items(time_entries)
         time_entries.map do |te|
+          milliseconds = te['dur'] || 0
           {
-            time: humanize_duration(te['dur']).to_f,
+            time_seconds: milliseconds.div(1000),
             date: Date.parse(te['start']).to_s,
-            comment: te['description']
+            comment: te['description'],
+            external_id: te['id'].to_s
           }
         end
       end

data/lib/sfctl/version.rb

@@ -1,3 +1,3 @@
 module Sfctl
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

data/sfctl.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'tty-progressbar', '~> 0.17.0'
   spec.add_runtime_dependency 'tty-prompt', '~> 0.21.0'
   spec.add_runtime_dependency 'tty-reader', '~> 0.7.0'
-  spec.add_runtime_dependency 'tty-screen', '~> 0.7.1'
+  spec.add_runtime_dependency 'tty-screen', '~> 0.8.1'
   spec.add_runtime_dependency 'tty-spinner', '~> 0.9.3'
   spec.add_runtime_dependency 'tty-table', '~> 0.11.0'
   spec.add_runtime_dependency 'tty-tree', '~> 0.4.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfctl
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Serhii Rudik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -311,14 +311,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
@@ -447,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: sfctl is a command line interface for the Starfish API.