sfctl 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '01538701ef7e4ff9999297400cb4853751ad2b45485f18524e9545416e34e1a7'
-  data.tar.gz: 1ac3e8c834236ceb56556770057e99e5644c7e2b4a86e63daa8078239cca37de
+  metadata.gz: 87640e37bddf52afff13b5ac880334429e8357308c4ca069df10cb06d5627463
+  data.tar.gz: 7431952f8f7d62c6ce5676276f6dc50218389c6d3433e8886e08351f0670dee6
 SHA512:
-  metadata.gz: fccda9b85147a7373c83426de924435d56221fb350547b6957b8f760f3669ec529d21f04c10c9dbb566c35586be35c97788d2e0b28f236e7a00a50b2c7efeccb
-  data.tar.gz: 4567297fec6b1a36896c2322ffec80ead48b532d558b2804c4c7859dfe67fbc5ecb00eafc84854e3bec965fc1f6118bfdde08df35d8c0a637d3f2489d388f686
+  metadata.gz: 5d4518ccdd8dfb1595954e19169402db62511a6be21b3011c082f1bf67661fa3156c44aedd80afdc79ab2fe5a5d991068127b51af02080eef644478f64c93cd2
+  data.tar.gz: 4ec95937e28e42fb82fc289851eadb46d475c2aa59fc9d6819f744e9df6a0ecf266596882cd70828d7aec4e67385008c7117e8552aee8f78811c98a37e5c018c

data/.gitignore

@@ -10,3 +10,5 @@
 # rspec failure tracking
 .rspec_status
 .DS_Store
+sfctl-*.gem
+/.sflink

data/.rubocop.yml

@@ -31,6 +31,9 @@ Metrics/BlockLength:
 Metrics/AbcSize:
   Max: 20
 
+Metrics/ClassLength:
+  Enabled: false
+
 Metrics/MethodLength:
   Max: 20
 

data/README.md

@@ -21,13 +21,11 @@ Flags:
 
 ## Installing `sfctl`
 
-### Using a Package Manager (Preferred)
+### Using Ruby Gems (Preferred)
 
-More to come.
-
-### Git
-
-More to come.
+```
+gem install sfctl
+```
 
 ## Authentication
 
@@ -109,8 +107,6 @@ We will provide a couple of integrations but also open up for plugins later on t
 As of today we support:
 
 - Toggl
-- Harvest
-- Clockify
 
 Another advantage of this approach is, that you think of any automation ⚒ you like to support your processes.
 

data/lib/sfctl/command.rb

@@ -10,7 +10,7 @@ module Sfctl
     CONFIG_FILENAME = '.sfctl'
     CONFIG_PATH = "#{Dir.home}/#{CONFIG_FILENAME}"
     LINK_CONFIG_FILENAME = '.sflink'
-    LINK_CONFIG_PATH = "#{Dir.home}/#{LINK_CONFIG_FILENAME}"
+    LINK_CONFIG_PATH = "#{Dir.pwd}/#{LINK_CONFIG_FILENAME}"
 
     TOGGL_PROVIDER = 'toggl'
     PROVIDERS_LIST = [

data/lib/sfctl/commands/auth.rb

@@ -22,12 +22,12 @@ module Sfctl
         which can be created on the profile page of your account.
       HEREDOC
       method_option :help, aliases: '-h', type: :boolean
-      def init(access_token)
+      def init(*)
         if options[:help]
           invoke :help, ['init']
         else
           require_relative 'auth/init'
-          Sfctl::Commands::Auth::Init.new(access_token, options).execute
+          Sfctl::Commands::Auth::Init.new(options).execute
         end
       end
     end

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

@@ -1,31 +1,29 @@
-# frozen_string_literal: true
-
 require_relative '../../command'
 require_relative '../../starfish'
 require 'pastel'
+require 'tty-prompt'
 require 'tty-spinner'
 
 module Sfctl
   module Commands
     class Auth
       class Init < Sfctl::Command
-        def initialize(access_token, options)
-          @access_token = access_token
+        def initialize(options)
           @options = options
-
           @pastel = Pastel.new(enabled: !@options['no-color'])
         end
 
         def execute(output: $stdout)
+          access_token = ::TTY::Prompt.new.ask("Access token(#{@options['starfish-host']}):", required: true)
           spinner = ::TTY::Spinner.new('[:spinner] Checking token ...')
           spinner.auto_spin
-          token_valid? ? update_config!(spinner, output) : render_error(spinner, output)
+          token_valid?(access_token) ? update_config!(spinner, output, access_token) : render_error(spinner, output)
         end
 
         private
 
-        def token_valid?
-          Starfish.check_authorization(@options['starfish-host'], @access_token)
+        def token_valid?(access_token)
+          Starfish.check_authorization(@options['starfish-host'], access_token)
         end
 
         def token_accepted_message
@@ -36,8 +34,8 @@ module Sfctl
           @pastel.red('Token is not accepted, please make sure you copy and paste it correctly.')
         end
 
-        def update_config!(spinner, output)
-          config.set :access_token, value: @access_token
+        def update_config!(spinner, output, access_token)
+          config.set :access_token, value: access_token
           save_config!
           spinner.success
           output.puts token_accepted_message

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

@@ -1,7 +1,10 @@
+require 'date'
 require 'pastel'
+require 'tty-spinner'
 require 'tty-prompt'
 require_relative '../../../command'
 require_relative '../../../starfish'
+require_relative '../../../toggl'
 
 module Sfctl
   module Commands
@@ -11,10 +14,10 @@ module Sfctl
           def initialize(options)
             @options = options
             @pastel = Pastel.new(enabled: !@options['no-color'])
-            @prompt = ::TTY::Prompt.new
+            @prompt = ::TTY::Prompt.new(help_color: :cyan)
           end
 
-          def execute(output: $stdout) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+          def execute(output: $stdout) # rubocop:disable Metrics/AbcSize
             return if !config_present?(output) || !link_config_present?(output)
 
             ltoken = access_token
@@ -33,24 +36,33 @@ module Sfctl
 
             provider = @prompt.select('Select provider:', PROVIDERS_LIST)
 
-            assignment_name = select_assignment(assignments)
+            assignment_obj = select_assignment(assignments)
 
             case provider
             when TOGGL_PROVIDER
-              setup_toggl_connection!(assignment_name)
+              setup_toggl_connection!(output, assignment_obj)
             end
+          end
+
+          private
 
+          def clear_conf_and_print_success!(output)
+            delete_providers_from_link_config!
             save_link_config!
 
             output.puts @pastel.green('Connection successfully added.')
           end
 
-          private
+          def delete_providers_from_link_config!
+            config.set(:providers, value: '')
+            config.delete(:providers)
+          end
 
           def select_assignment(assignments)
             @prompt.select('Select assignment:') do |menu|
               assignments.each.with_index do |asmnt, i|
-                menu.choice name: "#{i + 1}. #{asmnt['name']} / #{asmnt['service']}", value: asmnt['name']
+                menu.choice name: "#{i + 1}. #{asmnt['name']} / #{asmnt['service']}",
+                            value: { 'id' => asmnt['id'], 'name' => asmnt['name'], 'service' => asmnt['service'] }
               end
             end
           end
@@ -58,24 +70,81 @@ module Sfctl
           def filter_assignments(list)
             return list if config.fetch(:connections).nil?
 
-            added_assignments_name = config.fetch(:connections).keys
-            list.delete_if { |h| added_assignments_name.include?(h['name']) }
+            added_assignments_ids = config.fetch(:connections).keys
+            list.delete_if { |h| added_assignments_ids.include?(h['id'].to_s) }
             list
           end
 
-          def setup_toggl_connection!(assignment_name)
-            workspace_id = @prompt.ask('Workspace ID (required):', required: true)
-            project_ids = @prompt.ask('Project IDs  (required / comma separated):', required: true)
-            task_ids = @prompt.ask('Task IDs     (optional / comma separated):') || ''
-            billable = @prompt.select('Billable?    (required)', %w[yes no both])
-            rounding = @prompt.select('Rounding?    (required)', %w[on off])
-
-            config.set("connections.#{assignment_name}.provider", value: TOGGL_PROVIDER)
-            config.set("connections.#{assignment_name}.workspace_id", value: workspace_id)
-            config.set("connections.#{assignment_name}.project_ids", value: project_ids)
-            config.set("connections.#{assignment_name}.task_ids", value: task_ids)
-            config.set("connections.#{assignment_name}.billable", value: billable)
-            config.set("connections.#{assignment_name}.rounding", value: rounding)
+          def setup_toggl_connection!(output, assignment_obj) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+            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)
+            spinner.pause
+            output.puts
+            workspace = @prompt.select('Please select Workspace:') do |menu|
+              workspaces.each do |w|
+                menu.choice name: w['name'], value: w
+              end
+            end
+            workspace_id = workspace['id']
+
+            spinner.resume
+            _success, projects = Toggl.workspace_projects(toggl_token, workspace_id)
+
+            if projects.nil? || projects.empty?
+              spinner.stop
+              error_message = "There is no projects. Please visit #{TOGGL_PROVIDER} and create them before continue."
+              output.puts @pastel.red(error_message)
+              return
+            end
+
+            spinner.pause
+            output.puts
+            project_ids = @prompt.multi_select('Please select Projects:', min: 1) do |menu|
+              projects.each do |project|
+                menu.choice project['name'], project['id']
+              end
+            end
+
+            spinner.resume
+            tasks_objs = []
+            project_ids.each do |pj_id|
+              _success, tasks = Toggl.project_tasks(toggl_token, pj_id)
+              tasks_objs << tasks
+            end
+            tasks_objs.flatten!
+            tasks_objs.compact!
+            output.puts
+            spinner.success
+            tasks_ids = []
+            if tasks_objs.length.positive?
+              tasks_ids = @prompt.multi_select('Please select Tasks(by last 3 months):') do |menu|
+                tasks_objs.each do |to|
+                  menu.choice to['name'], to['id']
+                end
+              end
+            else
+              output.puts @pastel.yellow("You don't have tasks. Continue...")
+            end
+
+            billable = @prompt.select('Billable?', %w[yes no both])
+
+            rounding = @prompt.select('Rounding?', %w[on off])
+
+            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: TOGGL_PROVIDER)
+            config.set("connections.#{assignment_id}.workspace_id", value: workspace_id.to_s)
+            config.set("connections.#{assignment_id}.project_ids", value: project_ids.join(', '))
+            config.set("connections.#{assignment_id}.task_ids", value: tasks_ids.join(', '))
+            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

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

@@ -28,22 +28,23 @@ module Sfctl
           private
 
           def print_connections(output)
-            config.fetch(:connections).each_key do |assignment_name|
-              case config.fetch(:connections, assignment_name, :provider)
+            config.fetch(:connections).each_key do |assignment_id|
+              case config.fetch(:connections, assignment_id, :provider)
               when TOGGL_PROVIDER
-                print_toggl_connection!(output, assignment_name)
+                print_toggl_connection!(output, assignment_id)
               end
             end
           end
 
-          def print_toggl_connection!(output, assignment_name)
-            output.puts "Connection: #{assignment_name}"
+          def print_toggl_connection!(output, assignment_id) # rubocop:disable Metrics/AbcSize
+            output.puts "Connection: #{config.fetch(:connections, assignment_id, :name)}"
+            output.puts "  service: #{config.fetch(:connections, assignment_id, :service)}"
             output.puts "  provider: #{TOGGL_PROVIDER}"
-            output.puts "  workspace_id: #{config.fetch(:connections, assignment_name, :workspace_id)}"
-            output.puts "  project_ids: #{config.fetch(:connections, assignment_name, :project_ids)}"
-            output.puts "  task_ids: #{config.fetch(:connections, assignment_name, :task_ids)}"
-            output.puts "  billable: #{config.fetch(:connections, assignment_name, :billable)}"
-            output.puts "  rounding: #{config.fetch(:connections, assignment_name, :rounding)}"
+            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
         end

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

@@ -12,13 +12,11 @@ module Sfctl
           end
 
           def execute(output: $stdout)
-            read_link_config
+            return unless config_present?(output)
 
             PROVIDERS_LIST.each do |provider|
               read(provider, output)
             end
-          rescue TTY::Config::ReadError
-            output.puts @pastel.yellow('Please initialize time before continue.')
           end
 
           private

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

@@ -13,7 +13,7 @@ module Sfctl
           end
 
           def execute(output: $stdout)
-            read_link_config
+            return unless config_present?(output)
 
             prompt = ::TTY::Prompt.new
             provider = prompt.select('Setting up:', PROVIDERS_LIST)
@@ -24,8 +24,6 @@ module Sfctl
             when TOGGL_PROVIDER
               setup_toggl_provider!(output, prompt)
             end
-          rescue TTY::Config::ReadError
-            output.puts @pastel.yellow('Please initialize time before continue.')
           end
 
           private
@@ -37,7 +35,7 @@ module Sfctl
 
           def save_toggl_config!(output, access_token)
             config.set("providers.#{TOGGL_PROVIDER}.access_token", value: access_token)
-            save_link_config!
+            save_config!
             output.puts @pastel.green('Everything saved.')
           end
 

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

@@ -13,7 +13,7 @@ module Sfctl
           end
 
           def execute(output: $stdout)
-            read_link_config
+            return unless config_present?(output)
 
             prompt = ::TTY::Prompt.new
             provider = prompt.select('Unsetting:', PROVIDERS_LIST)
@@ -23,8 +23,6 @@ module Sfctl
             elsif prompt.yes?('Do you want to remove the delete the configuration?')
               remove_provider!(provider, output)
             end
-          rescue TTY::Config::ReadError
-            output.puts @pastel.yellow('Please initialize time before continue.')
           end
 
           private
@@ -33,7 +31,7 @@ module Sfctl
             providers = config.fetch(:providers)
             providers.delete(provider)
             config.set(:providers, value: providers)
-            save_link_config!
+            save_config!
             output.puts @pastel.green("Configuration for provider [#{provider}] was successfully deleted.")
           end
         end

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

@@ -10,7 +10,7 @@ require_relative '../../toggl'
 module Sfctl
   module Commands
     class Time
-      class Sync < Sfctl::Command # rubocop:disable Metrics/ClassLength
+      class Sync < Sfctl::Command
         def initialize(options)
           @options = options
           @pastel = Pastel.new(enabled: !@options['no-color'])
@@ -20,31 +20,44 @@ module Sfctl
         def execute(output: $stdout)
           return if !config_present?(output) || !link_config_present?(output)
 
-          success, data = Starfish.account_assignments(@options['starfish-host'], @options['all'], access_token)
-          unless success
-            output.puts @pastel.red('Something went wrong. Unable to fetch assignments')
+          if read_link_config['connections'].length.zero?
+            output.puts @pastel.red('Please add a connection before continue.')
             return
           end
 
-          sync_assignments(output, assignments_to_sync(data['assignments']))
+          sync_assignments(output, assignments_to_sync)
         rescue ThreadError, JSON::ParserError
+          output.puts
           output.puts @pastel.red('Something went wrong.')
         end
 
         private
 
-        def assignments_to_sync(assignments)
-          assignment_name = select_assignment(assignments)
+        def assignments_from_connections
+          read_link_config['connections'].map do |con|
+            id = con[0]
+            asmnt = con[1]
+            {
+              'id' => id,
+              'name' => asmnt['name'],
+              'service' => asmnt['service'] || '-'
+            }
+          end
+        end
+
+        def assignments_to_sync
+          assignments = assignments_from_connections
+          assignment_id = select_assignment(assignments)
 
-          return assignments if assignment_name == 'all'
+          return assignments if assignment_id == 'all'
 
-          assignments.select { |a| a['name'] == assignment_name }.to_a
+          assignments.select { |a| a['id'].to_s == assignment_id.to_s }.to_a
         end
 
         def select_assignment(assignments)
           @prompt.select('Which assignment do you want to sync?') do |menu|
             assignments.each do |asmnt|
-              menu.choice name: "#{asmnt['name']} / #{asmnt['service']}", value: asmnt['name']
+              menu.choice name: "#{asmnt['name']} / #{asmnt['service']}", value: asmnt['id'].to_s
             end
             menu.choice name: 'All', value: 'all'
           end
@@ -52,15 +65,15 @@ module Sfctl
 
         def sync_assignments(output, list)
           list.each do |assignment|
-            assignment_name = assignment['name']
-            connection = read_link_config['connections'].select { |c| c == assignment_name }
+            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}\"")
+              output.puts @pastel.red("Unable to find a connection for assignment \"#{assignment['name']}\"")
               next
             end
 
-            sync(output, assignment, connection[assignment_name])
+            sync(output, assignment, connection[assignment_id])
           end
         end
 
@@ -133,56 +146,66 @@ module Sfctl
           output.puts
           output.puts
 
-          time_entries
+          time_entries['data']
         end
 
         def time_entries_table_rows(time_entries)
-          rows = time_entries.map do |te|
+          rows = time_entries['data'].sort_by { |te| te['start'] }.map do |te|
             [
               Date.parse(te['start']).to_s,
               te['description'],
-              "#{humanize_duration(te['duration'])}h"
+              "#{humanize_duration(te['dur'])}h"
             ]
           end
-          rows.push(['Total:', '', "#{humanize_duration(time_entries.map { |te| te['duration'] }.sum)}h"])
+          rows.push(['Total:', '', "#{humanize_duration(time_entries['total_grand'])}h"])
           rows
         end
 
         def get_toggle_time_entries(next_report, connection)
-          _success, time_entries = Toggl.time_entries(
+          _success, data = Toggl.time_entries(
             read_link_config['providers'][TOGGL_PROVIDER]['access_token'], time_entries_params(next_report, connection)
           )
-          unless connection['task_ids'].empty?
-            time_entries.delete_if { |te| !connection['task_ids'].include?(te['id'].to_s) }
-          end
 
-          time_entries
+          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
-          {
-            wid: connection['workspace_id'],
-            pid: connection['project_ids'],
-            start_date: start_date.to_datetime.to_s,
-            end_date: "#{end_date}T23:59:59+00:00"
+          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(seconds)
+        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 = dec.zero? ? '' : ".#{amount}"
+          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['duration']),
+              time: humanize_duration(te['dur']).to_f,
               date: Date.parse(te['start']).to_s,
               comment: te['description']
             }

data/lib/sfctl/toggl.rb

@@ -3,13 +3,16 @@ require 'json'
 
 module Sfctl
   module Toggl
-    def self.conn(token)
+    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?
 
-      headers = {
-        'Content-Type' => 'application/json'
-      }
-      Faraday.new(url: "https://#{token}:api_token@www.toggl.com/api/v8/", headers: headers) do |builder|
+      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
@@ -19,8 +22,27 @@ module Sfctl
       [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)
-      response = conn(token).get('time_entries', params)
+      params[:user_agent] = 'api_test'
+      response = conn(token, 'reports').get('details', params)
       parsed_response(response)
     end
   end

data/lib/sfctl/version.rb

@@ -1,3 +1,3 @@
 module Sfctl
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sfctl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Serhii Rudik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: