sfctl 1.0.0 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 987345c89cefd795ef0e0caf100079fdae0d21928e5dd797216132aed206834b
-  data.tar.gz: b6935e7ebbaa5af76c6d16ce666da547b32262c3dbe688a7e51dc5201788e4bd
+  metadata.gz: 50b06c3748555b51931554ecc9278f97340fc1b3f27289e147a481a598bc01db
+  data.tar.gz: 7d449dee4713db1d04681069a88224a7e52385e18cf1903eb4fe32b1193f1217
 SHA512:
-  metadata.gz: ac9d36c7c89667c8cd92be1e1ef61009674ef889ba971a40108ca6ca9342e244033d239349ff66ead8fa994a827c5f3f21252bc440ffe3345298f03d47a3ef74
-  data.tar.gz: 6e29f52a803757984dede41303d62109734a09090492d414972f908369f70596dbadaabd35fe37557b73fa1286407d17b9fdeec6faeaf8ed2d39608a9bf467a9
+  metadata.gz: c62e5d25d1fd9247a4b919fbf496bd7a449a41689fd4d745197390f6a44fed0de074acdb73ca0bdae6675bb9b865498fff2c78c4001ee22e871bb75e286dc135
+  data.tar.gz: f72dd63951c7c9522e312251f10fa3a859c26cab4a1832f22a3fcd39e6584537b59e88b0e233c6d7950986c401b3ca7db69615e8638a1f94838513278421dfbd

data/.gitignore

@@ -12,3 +12,4 @@
 .DS_Store
 sfctl-*.gem
 /.sflink
+.byebug_history

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sfctl (0.1.0)
+    sfctl (1.0.4)
       faraday (~> 1.0)
       pastel (~> 0.7)
       rake (~> 12.0)
@@ -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/README.md

@@ -1,4 +1,5 @@
 # sfctl [![Build status](https://badge.buildkite.com/22ecc67f358163f4714383ff0fde8e847d1e3ae488fc10312f.svg)](https://buildkite.com/starfish/sf-control)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Falphatier-works%2Fsfctl.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Falphatier-works%2Fsfctl?ref=badge_shield)
 
 ```
 sfctl is a command line interface for the Starfish API.
@@ -270,3 +271,7 @@ Uploading to starfish.team:                 [IN PROGRESS|DONE]
 
 [NEXT CONNECTION]
 ```
+
+
+## License
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Falphatier-works%2Fsfctl.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Falphatier-works%2Fsfctl?ref=badge_large)

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

@@ -21,7 +21,7 @@ module Sfctl
         def execute(output: $stdout)
           return if !config_present?(output) || !link_config_present?(output)
 
-          if read_link_config['connections'].length.zero?
+          if connections.length.zero?
             output.puts @pastel.red('Please add a connection before continue.')
             return
           end
@@ -34,8 +34,12 @@ module Sfctl
 
         private
 
+        def connections
+          @connections ||= read_link_config.fetch('connections', [])
+        end
+
         def assignments_from_connections
-          read_link_config['connections'].map do |con|
+          connections.map do |con|
             id = con[0]
             asmnt = con[1]
             {
@@ -70,12 +74,12 @@ module Sfctl
         def sync_assignments(output, list)
           list.each do |assignment|
             assignment_id = assignment['id'].to_s
-            connection = read_link_config['connections'].select { |c| c == assignment_id }
+            connection = connections.select { |c| c == assignment_id }
             sync(output, assignment, connection[assignment_id])
           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'])
@@ -88,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/client.rb

@@ -13,7 +13,7 @@ module Sfctl
         api_path = api == 'reports' ? REPORTS_API_PATH : DEFAULT_API_PATH
 
         headers = { 'Content-Type' => 'application/json' }
-        Faraday.new(url: "https://#{token}:api_token@www.toggl.com/#{api_path}", headers: headers) do |builder|
+        Faraday.new(url: "https://#{token}:api_token@api.track.toggl.com/#{api_path}", headers: headers) do |builder|
           builder.request :retry
           builder.adapter :net_http
         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
@@ -20,31 +25,51 @@ module Sfctl
         output.puts
         output.puts
 
-        time_entries['data']
+        time_entries
       end
 
       def self.time_entries_table_rows(time_entries)
-        rows = time_entries['data'].sort_by { |te| te['start'] }.map do |te|
+        rows = time_entries.sort_by { |te| te['start'] }.map do |te|
           [
             Date.parse(te['start']).to_s,
             te['description'],
             "#{humanize_duration(te['dur'])}h"
           ]
         end
-        rows.push(['Total:', '', "#{humanize_duration(time_entries['total_grand'])}h"])
+        total_grand = time_entries.sum { |te| te['dur'] }
+        rows.push(['Total:', '', "#{humanize_duration(total_grand)}h"])
         rows
       end
 
       def self.get_time_entries(connection, toggl_config, report_interval)
-        _success, data = Toggl::Client.time_entries(
-          toggl_config['access_token'],
-          time_entries_params(connection, report_interval)
-        )
+        entries_list = []
+        error = nil
+
+        page = 1
+        loop do
+          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!
+
+          break if entries_list.length >= body['total_count']
+
+          page += 1
+        end
 
-        data
+        [entries_list, error]
       end
 
-      def self.time_entries_params(connection, report_interval)
+      def self.time_entries_params(connection, report_interval, page = 1)
         start_date, end_date = report_interval
         params = {
           workspace_id: connection['workspace_id'],
@@ -52,7 +77,8 @@ module Sfctl
           billable: connection['billable'],
           rounding: connection['rounding'],
           since: start_date.to_s,
-          until: end_date.to_s
+          until: end_date.to_s,
+          page: page
         }
         params[:task_ids] = connection['task_ids'] if connection['task_ids'].length.positive?
         params
@@ -78,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.0'.freeze
+  VERSION = '1.0.4'.freeze
 end

data/sfctl.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |spec|
   spec.license = 'MIT'
   spec.version = Sfctl::VERSION
   spec.authors = ['Serhii Rudik', 'Markus Kuhnt']
-  spec.email = ['serhii@starfish.team']
+  spec.email = ['hello@starfish.codes']
   spec.homepage = 'https://github.com/alphatier-works/sfctl'
   spec.summary = 'sfctl is a command line interface for the Starfish API.'
   # spec.homepage      = ''
@@ -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.0
+  version: 1.0.4
 platform: ruby
 authors:
 - Serhii Rudik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2021-09-01 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
@@ -377,7 +377,7 @@ dependencies:
         version: 0.4.2
 description:
 email:
-- serhii@starfish.team
+- hello@starfish.codes
 executables:
 - sfctl
 extensions: []