sfctl 0.0.4 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43943ce5d78b2cf30c6f6e171bd5ba8568adbce169ee8a9f66a64f1162b80ff8
-  data.tar.gz: 8960aea77d4cd2d90170005d275625435497a6685a835729728523d62d81ee4a
+  metadata.gz: 36e137543a9eed8b4f2fd6c472fd5899d5dc94a3b98fd50d8ae527b79dd671b4
+  data.tar.gz: 2cb0c12ea7a79b7fefae5cbbffba604815a7a9629b002049530c165461d4a701
 SHA512:
-  metadata.gz: b48ecdfda4052022ad25b1e8008de8148c29e3a88e5b36b33261a597d58fcb49e6ee98b7d41c63443d01ed652d7c304e68a4622a119e707b1a8afe427f4271f2
-  data.tar.gz: 332ce44447b8f1d2b020eda9b3f47c982a63a8bc4c119432446e93d101b19516fe34934e970dbfd5123cd3365fd4cb98d784b55e30f67011599095688d8e983f
+  metadata.gz: f0e23db4406b9d253250398269a216a819e1a55afd11570f9515ab909e7b230b316cdbd8eedf28c910c78772e0aece324dc0adad1a4a0210b253b700a64e1df1
+  data.tar.gz: 292842c5de401507c927181a9c346e0a324a9944e5653fe4be752d8951dfc1bcac8e902d6e137eb0426ed0c6fa5636568fe2377a14361eb6a2d93d0a4c7a0d0a

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.0.4)
+    sfctl (1.0.1)
       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/cli.rb

@@ -21,7 +21,7 @@ module Sfctl
     end
 
     class_option :"no-color", type: :boolean, default: false, desc: 'Disable colorization in output'
-    class_option :"starfish-host", type: :string, default: 'https://starfish.team',
+    class_option :"starfish-host", type: :string, default: 'https://app.starfish.team',
                                    desc: 'The starfish API endpoint',
                                    banner: 'HOST'
 

data/lib/sfctl/command.rb

@@ -13,8 +13,10 @@ module Sfctl
     LINK_CONFIG_PATH = "#{Dir.pwd}/#{LINK_CONFIG_FILENAME}"
 
     TOGGL_PROVIDER = 'toggl'
+    HARVEST_PROVIDER = 'harvest'
     PROVIDERS_LIST = [
-      TOGGL_PROVIDER
+      TOGGL_PROVIDER,
+      HARVEST_PROVIDER
     ].freeze
 
     def_delegators :command, :run

data/lib/sfctl/commands/account/assignments.rb

@@ -1,7 +1,7 @@
 require 'pastel'
 require 'tty-table'
 require_relative '../../command'
-require_relative '../../starfish'
+require_relative '../../starfish/client'
 
 module Sfctl
   module Commands
@@ -15,7 +15,7 @@ module Sfctl
         def execute(output: $stdout)
           return unless config_present?(output)
 
-          success, data = Starfish.account_assignments(@options['starfish-host'], @options['all'], access_token)
+          success, data = Starfish::Client.account_assignments(@options['starfish-host'], @options['all'], access_token)
 
           unless success
             output.puts @pastel.red('Something went wrong. Unable to fetch assignments')

data/lib/sfctl/commands/account/info.rb

@@ -1,7 +1,7 @@
 require 'pastel'
 require 'tty-table'
 require_relative '../../command'
-require_relative '../../starfish'
+require_relative '../../starfish/client'
 
 module Sfctl
   module Commands
@@ -15,7 +15,7 @@ module Sfctl
         def execute(output: $stdout)
           return unless config_present?(output)
 
-          success, info = Starfish.account_info(@options['starfish-host'], access_token)
+          success, info = Starfish::Client.account_info(@options['starfish-host'], access_token)
 
           unless success
             output.puts @pastel.red('Something went wrong. Unable to fetch account info')

data/lib/sfctl/commands/auth/init.rb

@@ -1,5 +1,5 @@
 require_relative '../../command'
-require_relative '../../starfish'
+require_relative '../../starfish/client'
 require 'pastel'
 require 'tty-prompt'
 require 'tty-spinner'
@@ -23,7 +23,7 @@ module Sfctl
         private
 
         def token_valid?(access_token)
-          Starfish.check_authorization(@options['starfish-host'], access_token)
+          Starfish::Client.check_authorization(@options['starfish-host'], access_token)
         end
 
         def token_accepted_message

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

@@ -3,8 +3,9 @@ require 'pastel'
 require 'tty-spinner'
 require 'tty-prompt'
 require_relative '../../../command'
-require_relative '../../../starfish'
-require_relative '../../../toggl'
+require_relative '../../../starfish/client'
+require_relative '../../../toggl/client'
+require_relative '../../../harvest/client'
 
 module Sfctl
   module Commands
@@ -22,7 +23,7 @@ module Sfctl
 
             ltoken = access_token
             config.delete(:access_token)
-            success, data = Starfish.account_assignments(@options['starfish-host'], @options['all'], ltoken)
+            success, data = Starfish::Client.account_assignments(@options['starfish-host'], @options['all'], ltoken)
             unless success
               output.puts @pastel.red('Something went wrong. Unable to fetch assignments')
               return
@@ -38,14 +39,20 @@ module Sfctl
 
             assignment_obj = select_assignment(assignments)
 
+            setup_connection!(provider, output, assignment_obj)
+          end
+
+          private
+
+          def setup_connection!(provider, output, assignment_obj)
             case provider
             when TOGGL_PROVIDER
               setup_toggl_connection!(output, assignment_obj)
+            when HARVEST_PROVIDER
+              setup_harvest_connection!(output, assignment_obj)
             end
           end
 
-          private
-
           def clear_conf_and_print_success!(output)
             delete_providers_from_link_config!
             save_link_config!
@@ -75,14 +82,22 @@ module Sfctl
             list
           end
 
-          def setup_toggl_connection!(output, assignment_obj) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+          def ask_for_billable
+            @prompt.select('Billable?', %w[yes no both])
+          end
+
+          def ask_for_rounding
+            @prompt.select('Rounding?', %w[on off])
+          end
+
+          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']
             toggl_token = read_link_config['providers'][TOGGL_PROVIDER]['access_token']
 
             spinner.auto_spin
-            _success, workspaces = Toggl.workspaces(toggl_token)
+            _success, workspaces = Toggl::Client.workspaces(toggl_token)
             spinner.pause
             output.puts
             workspace = @prompt.select('Please select Workspace:') do |menu|
@@ -93,7 +108,7 @@ module Sfctl
             workspace_id = workspace['id']
 
             spinner.resume
-            _success, projects = Toggl.workspace_projects(toggl_token, workspace_id)
+            _success, projects = Toggl::Client.workspace_projects(toggl_token, workspace_id)
 
             if projects.nil? || projects.empty?
               spinner.stop
@@ -113,7 +128,7 @@ module Sfctl
             spinner.resume
             tasks_objs = []
             project_ids.each do |pj_id|
-              _success, tasks = Toggl.project_tasks(toggl_token, pj_id)
+              _success, tasks = Toggl::Client.project_tasks(toggl_token, pj_id)
               tasks_objs << tasks
             end
             tasks_objs.flatten!
@@ -131,9 +146,9 @@ module Sfctl
               output.puts @pastel.yellow("You don't have tasks. Continue...")
             end
 
-            billable = @prompt.select('Billable?', %w[yes no both])
+            billable = ask_for_billable
 
-            rounding = @prompt.select('Rounding?', %w[on off])
+            rounding = ask_for_rounding
 
             config.set("connections.#{assignment_id}.name", value: assignment_obj['name'])
             config.set("connections.#{assignment_id}.service", value: assignment_obj['service'])
@@ -146,6 +161,66 @@ module Sfctl
 
             clear_conf_and_print_success!(output)
           end
+
+          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']
+            harvest_account_id = read_link_config['providers'][HARVEST_PROVIDER]['account_id']
+            harvest_token = read_link_config['providers'][HARVEST_PROVIDER]['access_token']
+
+            spinner.auto_spin
+            _success, projects = Harvest::Client.projects(harvest_account_id, harvest_token)
+
+            if projects.nil? || projects.empty?
+              spinner.stop
+              error_message = "There is no projects. Please visit #{HARVEST_PROVIDER} and create them before continue."
+              output.puts @pastel.red(error_message)
+              return
+            end
+
+            spinner.pause
+            output.puts
+            project = @prompt.select('Please select Project:') do |menu|
+              projects.each do |pj|
+                menu.choice name: pj['name'], value: pj
+              end
+            end
+            project_id = project['id']
+
+            spinner.resume
+            _success, tasks = Harvest::Client.tasks(harvest_account_id, harvest_token)
+
+            if tasks.nil? || tasks.empty?
+              spinner.stop
+              error_message = "There is no tasks. Please visit #{HARVEST_PROVIDER} and create them before continue."
+              output.puts @pastel.red(error_message)
+              return
+            end
+
+            spinner.success
+            output.puts
+            task = @prompt.select('Please select Task:') do |menu|
+              tasks.each do |t|
+                menu.choice name: t['name'], value: t
+              end
+            end
+            task_id = task['id']
+
+            billable = ask_for_billable
+
+            rounding = ask_for_rounding
+
+            config.set("connections.#{assignment_id}.name", value: assignment_obj['name'])
+            config.set("connections.#{assignment_id}.service", value: assignment_obj['service'])
+            config.set("connections.#{assignment_id}.provider", value: HARVEST_PROVIDER)
+            config.set("connections.#{assignment_id}.project_id", value: project_id.to_s)
+            config.set("connections.#{assignment_id}.task_id", value: task_id.to_s)
+            config.set("connections.#{assignment_id}.billable", value: billable)
+            config.set("connections.#{assignment_id}.rounding", value: rounding)
+
+            clear_conf_and_print_success!(output)
+          end
         end
       end
     end

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

@@ -29,23 +29,41 @@ module Sfctl
 
           def print_connections(output)
             config.fetch(:connections).each_key do |assignment_id|
+              print_header!(output, assignment_id)
+
               case config.fetch(:connections, assignment_id, :provider)
               when TOGGL_PROVIDER
                 print_toggl_connection!(output, assignment_id)
+              when HARVEST_PROVIDER
+                print_harvest_connection!(output, assignment_id)
               end
+
+              print_footer!(output, assignment_id)
             end
           end
 
-          def print_toggl_connection!(output, assignment_id) # rubocop:disable Metrics/AbcSize
+          def print_header!(output, assignment_id)
             output.puts "Connection: #{config.fetch(:connections, assignment_id, :name)}"
             output.puts "  service: #{config.fetch(:connections, assignment_id, :service)}"
+          end
+
+          def print_footer!(output, assignment_id)
+            output.puts "  billable: #{config.fetch(:connections, assignment_id, :billable)}"
+            output.puts "  rounding: #{config.fetch(:connections, assignment_id, :rounding)}"
+            output.puts
+          end
+
+          def print_toggl_connection!(output, assignment_id)
             output.puts "  provider: #{TOGGL_PROVIDER}"
             output.puts "  workspace_id: #{config.fetch(:connections, assignment_id, :workspace_id)}"
             output.puts "  project_ids: #{config.fetch(:connections, assignment_id, :project_ids)}"
             output.puts "  task_ids: #{config.fetch(:connections, assignment_id, :task_ids)}"
-            output.puts "  billable: #{config.fetch(:connections, assignment_id, :billable)}"
-            output.puts "  rounding: #{config.fetch(:connections, assignment_id, :rounding)}"
-            output.puts
+          end
+
+          def print_harvest_connection!(output, assignment_id)
+            output.puts "  provider: #{HARVEST_PROVIDER}"
+            output.puts "  project_id: #{config.fetch(:connections, assignment_id, :project_id)}"
+            output.puts "  task_id: #{config.fetch(:connections, assignment_id, :task_id)}"
           end
         end
       end

data/lib/sfctl/commands/time/providers/get.rb

@@ -28,7 +28,7 @@ module Sfctl
             else
               output.puts "Provider: #{@pastel.cyan(provider)}"
               info.each_key do |k|
-                output.puts "  #{k.upcase}: #{info[k]}"
+                output.puts "  #{k.upcase}: #{@pastel.magenta(info[k])}"
               end
             end
           end

data/lib/sfctl/commands/time/providers/set.rb

@@ -18,11 +18,13 @@ module Sfctl
             prompt = ::TTY::Prompt.new
             provider = prompt.select('Setting up:', PROVIDERS_LIST)
 
-            !ask_for_replace(output, prompt) && return unless config.fetch("providers.#{TOGGL_PROVIDER}").nil?
+            !ask_for_replace(output, prompt) && return unless config.fetch("providers.#{provider}").nil?
 
             case provider
             when TOGGL_PROVIDER
               setup_toggl_provider!(output, prompt)
+            when HARVEST_PROVIDER
+              setup_harvest_provider!(output, prompt)
             end
           end
 
@@ -33,22 +35,46 @@ module Sfctl
             prompt.yes?('Do you want to replace it?')
           end
 
-          def save_toggl_config!(output, access_token)
-            config.set("providers.#{TOGGL_PROVIDER}.access_token", value: access_token)
+          def correct?(prompt)
+            prompt.yes?('Is that information correct?')
+          end
+
+          def save_config_and_print_message!(output)
             save_config!
             output.puts @pastel.green('Everything saved.')
           end
 
+          def save_toggl_config!(output, access_token)
+            config.set("providers.#{TOGGL_PROVIDER}.access_token", value: access_token)
+            save_config_and_print_message!(output)
+          end
+
           def setup_toggl_provider!(output, prompt)
             output.puts
             access_token = prompt.ask("Your access token at [#{@pastel.green(TOGGL_PROVIDER)}]:", required: true)
-            is_correct = prompt.yes?('Is that information correct?')
-            if is_correct
+            if correct?(prompt)
               save_toggl_config!(output, access_token)
             else
               setup_toggl_provider!(output, prompt)
             end
           end
+
+          def save_harvest_config!(output, account_id, access_token)
+            config.set("providers.#{HARVEST_PROVIDER}.account_id", value: account_id)
+            config.set("providers.#{HARVEST_PROVIDER}.access_token", value: access_token)
+            save_config_and_print_message!(output)
+          end
+
+          def setup_harvest_provider!(output, prompt)
+            output.puts
+            account_id = prompt.ask("Your Account ID at [#{@pastel.green(HARVEST_PROVIDER)}]:", required: true)
+            access_token = prompt.ask("Your Token at [#{@pastel.green(HARVEST_PROVIDER)}]:", required: true)
+            if correct?(prompt)
+              save_harvest_config!(output, account_id, access_token)
+            else
+              setup_harvest_provider!(output, prompt)
+            end
+          end
         end
       end
     end

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

@@ -4,8 +4,9 @@ require 'tty-prompt'
 require 'tty-spinner'
 require 'tty-table'
 require_relative '../../command'
-require_relative '../../starfish'
-require_relative '../../toggl'
+require_relative '../../starfish/client'
+require_relative '../../toggl/sync'
+require_relative '../../harvest/sync'
 
 module Sfctl
   module Commands
@@ -20,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
@@ -33,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]
             {
@@ -69,38 +74,47 @@ 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 }
-
-            if connection.empty?
-              output.puts @pastel.red("Unable to find a connection for assignment \"#{assignment['name']}\"")
-              next
-            end
-
+            connection = connections.select { |c| c == assignment_id }
             sync(output, assignment, connection[assignment_id])
           end
         end
 
-        def sync(output, assignment, connection)
-          case connection['provider']
-          when TOGGL_PROVIDER
-            sync_with_toggl!(output, assignment, connection)
-          end
-        end
-
-        def sync_with_toggl!(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.next_report(@options['starfish-host'], access_token, assignment['id'])
+          success, next_report = Starfish::Client.next_report(@options['starfish-host'], access_token, assignment['id'])
 
           print_no_next_reporting_segment(output) && return if !success || next_report.empty?
 
-          time_entries = load_data_from_toggl(output, next_report, connection)
+          time_entries = load_time_entries(output, next_report, connection)
 
           print_dry_run_enabled(output) && return if @options['dry_run']
 
           print_report_contains_data(output, next_report) && return if touchy?(next_report)
 
-          uploading_to_starfish(output, assignment, time_entries)
+          uploading_to_starfish(output, assignment, time_entries, connection) if time_entries.any?
+        end
+
+        def report_interval(record)
+          start_date = Date.parse("#{record['year']}-#{record['month']}-01")
+          end_date = start_date.next_month.prev_day
+          [start_date, end_date]
+        end
+
+        def load_time_entries(output, next_report, connection)
+          output.puts "Next Report:   #{@pastel.cyan(report_name(next_report))}"
+          next_report_interval = report_interval(next_report)
+
+          case connection['provider']
+          when TOGGL_PROVIDER
+            Toggl::Sync.load_data(
+              output, connection, read_link_config['providers'][TOGGL_PROVIDER], @pastel, next_report_interval
+            )
+          when HARVEST_PROVIDER
+            Harvest::Sync.load_data(
+              output, connection, read_link_config['providers'][HARVEST_PROVIDER], @pastel, next_report_interval
+            )
+          end
         end
 
         def touchy?(next_report)
@@ -133,93 +147,21 @@ module Sfctl
           true
         end
 
-        def load_data_from_toggl(output, next_report, connection)
-          output.puts "Next Report:   #{@pastel.cyan(report_name(next_report))}"
-
-          spinner = TTY::Spinner.new("Loaded data from #{TOGGL_PROVIDER}: [:spinner]", format: :dots)
-          spinner.auto_spin
-
-          time_entries = get_toggle_time_entries(next_report, connection)
-
-          spinner.success(@pastel.green('Done'))
-
-          table = TTY::Table.new %w[Date Comment Time], time_entries_table_rows(time_entries)
-          output.puts
-          output.print table.render(:unicode, padding: [0, 1], alignments: %i[left left right])
-          output.puts
-          output.puts
-
-          time_entries['data']
-        end
-
-        def time_entries_table_rows(time_entries)
-          rows = time_entries['data'].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"])
-          rows
-        end
-
-        def get_toggle_time_entries(next_report, connection)
-          _success, data = Toggl.time_entries(
-            read_link_config['providers'][TOGGL_PROVIDER]['access_token'], time_entries_params(next_report, connection)
-          )
-
-          data
-        end
-
-        def time_entries_params(next_report, connection)
-          start_date = Date.parse("#{next_report['year']}-#{next_report['month']}-01")
-          end_date = start_date.next_month.prev_day
-          params = {
-            workspace_id: connection['workspace_id'],
-            project_ids: connection['project_ids'],
-            billable: connection['billable'],
-            rounding: connection['rounding'],
-            since: start_date.to_s,
-            until: end_date.to_s
-          }
-          params[:task_ids] = connection['task_ids'] if connection['task_ids'].length.positive?
-          params
-        end
-
-        def humanize_duration(milliseconds)
-          return '0' if milliseconds.nil?
-
-          seconds = milliseconds / 1000
-          minutes = seconds / 60
-          int = (minutes / 60).ceil
-          dec = minutes % 60
-          amount = (dec * 100) / 60
-          amount = if dec.zero?
-                     ''
-                   elsif amount.to_s.length == 1
-                     ".0#{amount}"
-                   else
-                     ".#{amount}"
-                   end
-          "#{int}#{amount}"
-        end
-
-        def assignment_items(time_entries)
-          time_entries.map do |te|
-            {
-              time: humanize_duration(te['dur']).to_f,
-              date: Date.parse(te['start']).to_s,
-              comment: te['description']
-            }
+        def assignment_items(time_entries, connection)
+          case connection['provider']
+          when TOGGL_PROVIDER
+            Toggl::Sync.assignment_items(time_entries)
+          when HARVEST_PROVIDER
+            Harvest::Sync.assignment_items(time_entries, connection)
           end
         end
 
-        def uploading_to_starfish(output, assignment, time_entries)
+        def uploading_to_starfish(output, assignment, time_entries, connection)
           spinner = TTY::Spinner.new('Uploading to starfish.team: [:spinner]', format: :dots)
           spinner.auto_spin
-          success = Starfish.update_next_report(
-            @options['starfish-host'], access_token, assignment['id'], assignment_items(time_entries)
+
+          success = Starfish::Client.update_next_report(
+            @options['starfish-host'], access_token, assignment['id'], assignment_items(time_entries, connection)
           )
           print_upload_results(output, success, spinner)
         end

data/lib/sfctl/harvest/client.rb

@@ -0,0 +1,44 @@
+require 'faraday'
+require 'json'
+
+module Sfctl
+  module Harvest
+    module Client
+      API_V2_PATH = 'api/v2/'.freeze
+
+      def self.conn(account_id, token)
+        raise 'Please set Harvest provider before continue.' if account_id.nil? || token.nil?
+
+        headers = {
+          'Content-Type' => 'application/json',
+          'Harvest-Account-ID' => account_id,
+          'Authorization' => "Bearer #{token}"
+        }
+
+        Faraday.new(url: "https://api.harvestapp.com/#{API_V2_PATH}", headers: headers) do |builder|
+          builder.request :retry
+          builder.adapter :net_http
+        end
+      end
+
+      def self.parsed_response(response, key)
+        [response.status == 200, JSON.parse(response.body)[key]]
+      end
+
+      def self.projects(account_id, token)
+        response = conn(account_id, token).get('projects')
+        parsed_response(response, 'projects')
+      end
+
+      def self.tasks(account_id, token)
+        response = conn(account_id, token).get('tasks')
+        parsed_response(response, 'tasks')
+      end
+
+      def self.time_entries(account_id, token, params)
+        response = conn(account_id, token).get('time_entries', params)
+        parsed_response(response, 'time_entries')
+      end
+    end
+  end
+end

data/lib/sfctl/harvest/sync.rb

@@ -0,0 +1,83 @@
+require 'tty-spinner'
+require 'tty-table'
+require_relative '../command'
+require_relative './client'
+
+module Sfctl
+  module Harvest
+    module Sync
+      def self.load_data(output, connection, harvest_config, pastel, report_interval)
+        spinner = TTY::Spinner.new("Loaded data from #{Sfctl::Command::HARVEST_PROVIDER}: [:spinner]", format: :dots)
+        spinner.auto_spin
+
+        time_entries = get_time_entries(connection, harvest_config, report_interval)
+
+        spinner.success(pastel.green('Done'))
+
+        table = TTY::Table.new %w[Date Comment Time], time_entries_table_rows(time_entries, connection)
+        output.puts
+        output.print table.render(:unicode, padding: [0, 1], alignments: %i[left left right])
+        output.puts
+        output.puts
+
+        time_entries
+      end
+
+      def self.get_time_entries(connection, harvest_config, report_interval)
+        _success, data = Harvest::Client.time_entries(
+          harvest_config['account_id'],
+          harvest_config['access_token'],
+          time_entries_params(connection, report_interval)
+        )
+
+        data
+      end
+
+      def self.hours_field(rounding)
+        return 'rounded_hours' if rounding == 'on'
+
+        'hours'
+      end
+
+      def self.time_entries_table_rows(time_entries, connection)
+        hours_field = hours_field(connection['rounding'])
+        rows = time_entries.sort_by { |te| te['spent_date'] }.map do |te|
+          [
+            te['spent_date'],
+            te['notes'],
+            "#{te[hours_field]}h"
+          ]
+        end
+        total_grand = time_entries.map { |te| te[hours_field] }.sum
+        rows.push(['Total:', '', "#{total_grand}h"])
+        rows
+      end
+
+      def self.time_entries_params(connection, report_interval)
+        start_date, end_date = report_interval
+        params = {
+          project_id: connection['project_id'],
+          task_id: connection['task_id'],
+          from: start_date.to_s,
+          to: end_date.to_s
+        }
+        params[:is_billed] = connection['billable'] == 'yes' unless connection['billable'] == 'both'
+        params
+      end
+
+      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_seconds: time_seconds.round,
+            date: te['spent_date'].to_s,
+            comment: te['notes'],
+            external_id: te['id'].to_s
+          }
+        end
+      end
+    end
+  end
+end

data/lib/sfctl/starfish/client.rb

@@ -0,0 +1,53 @@
+require 'faraday'
+require 'json'
+
+module Sfctl
+  module Starfish
+    module Client
+      def self.conn(endpoint, token)
+        raise 'Before continue please pass endpoint and token.' if endpoint.nil? || token.nil?
+
+        headers = {
+          'Content-Type' => 'application/json',
+          'X-Starfish-Auth' => token
+        }
+        Faraday.new(url: "#{endpoint}/api/v1", headers: headers) do |builder|
+          builder.request :retry
+          builder.adapter :net_http
+        end
+      end
+
+      def self.parsed_response(response)
+        [response.status == 200, JSON.parse(response.body)]
+      end
+
+      def self.check_authorization(endpoint, token)
+        response = conn(endpoint, token).get('profile')
+        response.status == 200
+      end
+
+      def self.account_info(endpoint, token)
+        response = conn(endpoint, token).get('profile')
+        parsed_response(response)
+      end
+
+      def self.account_assignments(endpoint, all, token)
+        api_conn = conn(endpoint, token)
+        response = all ? api_conn.get('assignments?all=1') : api_conn.get('assignments')
+        parsed_response(response)
+      end
+
+      def self.next_report(endpoint, token, assignment_id)
+        api_conn = conn(endpoint, token)
+        response = api_conn.get("assignments/#{assignment_id}/next_report")
+        parsed_response(response)
+      end
+
+      def self.update_next_report(endpoint, token, assignment_id, items)
+        api_conn = conn(endpoint, token)
+        response = api_conn.put("assignments/#{assignment_id}/next_report", JSON.generate(items: items))
+        response.status == 204
+      end
+    end
+  end
+end

data/lib/sfctl/toggl/client.rb

@@ -0,0 +1,51 @@
+require 'faraday'
+require 'json'
+
+module Sfctl
+  module Toggl
+    module Client
+      DEFAULT_API_PATH = 'api/v8/'.freeze
+      REPORTS_API_PATH = 'reports/api/v2/'.freeze
+
+      def self.conn(token, api = 'default')
+        raise 'Please set toggl provider before continue.' if token.nil?
+
+        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|
+          builder.request :retry
+          builder.adapter :net_http
+        end
+      end
+
+      def self.parsed_response(response)
+        [response.status == 200, JSON.parse(response.body)]
+      end
+
+      def self.workspaces(token)
+        response = conn(token).get('workspaces')
+        parsed_response(response)
+      end
+
+      def self.workspace_projects(token, workspace_id)
+        response = conn(token).get("workspaces/#{workspace_id}/projects")
+        parsed_response(response)
+      end
+
+      def self.project_tasks(token, project_id)
+        response = conn(token).get("workspaces/#{project_id}/tasks")
+
+        return [] if response.body.length.zero?
+
+        parsed_response(response)
+      end
+
+      def self.time_entries(token, params)
+        params[:user_agent] = 'api_test'
+        response = conn(token, 'reports').get('details', params)
+        parsed_response(response)
+      end
+    end
+  end
+end

data/lib/sfctl/toggl/sync.rb

@@ -0,0 +1,118 @@
+require 'tty-spinner'
+require 'tty-table'
+require_relative '../command'
+require_relative './client'
+
+module Sfctl
+  module Toggl
+    module Sync
+      def self.load_data(output, connection, toggl_config, pastel, report_interval)
+        spinner = TTY::Spinner.new("Loaded data from #{Sfctl::Command::TOGGL_PROVIDER}: [:spinner]", format: :dots)
+        spinner.auto_spin
+
+        time_entries, error = get_time_entries(connection, toggl_config, report_interval)
+
+        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
+        output.print table.render(:unicode, padding: [0, 1], alignments: %i[left left right])
+        output.puts
+        output.puts
+
+        time_entries
+      end
+
+      def self.time_entries_table_rows(time_entries)
+        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
+        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)
+        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
+
+        [entries_list, error]
+      end
+
+      def self.time_entries_params(connection, report_interval, page = 1)
+        start_date, end_date = report_interval
+        params = {
+          workspace_id: connection['workspace_id'],
+          project_ids: connection['project_ids'],
+          billable: connection['billable'],
+          rounding: connection['rounding'],
+          since: start_date.to_s,
+          until: end_date.to_s,
+          page: page
+        }
+        params[:task_ids] = connection['task_ids'] if connection['task_ids'].length.positive?
+        params
+      end
+
+      def self.humanize_duration(milliseconds)
+        return '0' if milliseconds.nil?
+
+        seconds = milliseconds / 1000
+        minutes = seconds / 60
+        int = (minutes / 60).ceil
+        dec = minutes % 60
+        amount = (dec * 100) / 60
+        amount = if dec.zero?
+                   ''
+                 elsif amount.to_s.length == 1
+                   ".0#{amount}"
+                 else
+                   ".#{amount}"
+                 end
+        "#{int}#{amount}"
+      end
+
+      def self.assignment_items(time_entries)
+        time_entries.map do |te|
+          milliseconds = te['dur'] || 0
+          {
+            time_seconds: milliseconds.div(1000),
+            date: Date.parse(te['start']).to_s,
+            comment: te['description'],
+            external_id: te['id'].to_s
+          }
+        end
+      end
+    end
+  end
+end

data/lib/sfctl/version.rb

@@ -1,3 +1,3 @@
 module Sfctl
-  VERSION = '0.0.4'.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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sfctl
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.3
 platform: ruby
 authors:
 - Serhii Rudik
 - Markus Kuhnt
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-23 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
@@ -375,7 +375,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.2
-description: 
+description:
 email:
 - serhii@starfish.team
 executables:
@@ -417,9 +417,12 @@ files:
 - lib/sfctl/commands/time/providers/set.rb
 - lib/sfctl/commands/time/providers/unset.rb
 - lib/sfctl/commands/time/sync.rb
-- lib/sfctl/starfish.rb
+- lib/sfctl/harvest/client.rb
+- lib/sfctl/harvest/sync.rb
+- lib/sfctl/starfish/client.rb
 - lib/sfctl/templates/.gitkeep
-- lib/sfctl/toggl.rb
+- lib/sfctl/toggl/client.rb
+- lib/sfctl/toggl/sync.rb
 - lib/sfctl/version.rb
 - scripts/test.sh
 - sfctl.gemspec
@@ -429,7 +432,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/alphatier-works/sfctl/issues
   source_code_uri: https://github.com/alphatier-works/sfctl
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -444,8 +447,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: sfctl is a command line interface for the Starfish API.
 test_files: []

data/lib/sfctl/starfish.rb

@@ -1,51 +0,0 @@
-require 'faraday'
-require 'json'
-
-module Sfctl
-  module Starfish
-    def self.conn(endpoint, token)
-      raise 'Before continue please pass endpoint and token.' if endpoint.nil? || token.nil?
-
-      headers = {
-        'Content-Type' => 'application/json',
-        'X-Starfish-Auth' => token
-      }
-      Faraday.new(url: "#{endpoint}/api/v1", headers: headers) do |builder|
-        builder.request :retry
-        builder.adapter :net_http
-      end
-    end
-
-    def self.parsed_response(response)
-      [response.status == 200, JSON.parse(response.body)]
-    end
-
-    def self.check_authorization(endpoint, token)
-      response = conn(endpoint, token).get('profile')
-      response.status == 200
-    end
-
-    def self.account_info(endpoint, token)
-      response = conn(endpoint, token).get('profile')
-      parsed_response(response)
-    end
-
-    def self.account_assignments(endpoint, all, token)
-      api_conn = conn(endpoint, token)
-      response = all ? api_conn.get('assignments?all=1') : api_conn.get('assignments')
-      parsed_response(response)
-    end
-
-    def self.next_report(endpoint, token, assignment_id)
-      api_conn = conn(endpoint, token)
-      response = api_conn.get("assignments/#{assignment_id}/next_report")
-      parsed_response(response)
-    end
-
-    def self.update_next_report(endpoint, token, assignment_id, items)
-      api_conn = conn(endpoint, token)
-      response = api_conn.put("assignments/#{assignment_id}/next_report", JSON.generate(items: items))
-      response.status == 204
-    end
-  end
-end

data/lib/sfctl/toggl.rb

@@ -1,49 +0,0 @@
-require 'faraday'
-require 'json'
-
-module Sfctl
-  module Toggl
-    DEFAULT_API_PATH = 'api/v8/'.freeze
-    REPORTS_API_PATH = 'reports/api/v2/'.freeze
-
-    def self.conn(token, api = 'default')
-      raise 'Please set toggl provider before continue.' if token.nil?
-
-      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|
-        builder.request :retry
-        builder.adapter :net_http
-      end
-    end
-
-    def self.parsed_response(response)
-      [response.status == 200, JSON.parse(response.body)]
-    end
-
-    def self.workspaces(token)
-      response = conn(token).get('workspaces')
-      parsed_response(response)
-    end
-
-    def self.workspace_projects(token, workspace_id)
-      response = conn(token).get("workspaces/#{workspace_id}/projects")
-      parsed_response(response)
-    end
-
-    def self.project_tasks(token, project_id)
-      response = conn(token).get("workspaces/#{project_id}/tasks")
-
-      return [] if response.body.length.zero?
-
-      parsed_response(response)
-    end
-
-    def self.time_entries(token, params)
-      params[:user_agent] = 'api_test'
-      response = conn(token, 'reports').get('details', params)
-      parsed_response(response)
-    end
-  end
-end