dude-cli 0.5.5 → 0.6.2.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baa714098ced1d2a74c2e15015c0aa82e092d390a9fbd26c156587c59c130e7e
-  data.tar.gz: b4d3a9205facc7828ece0352aea4b926d3d1d57f543736e5e9093307f4c30154
+  metadata.gz: 112ffe56830a86b563b232d649eb7a5de9d3a253d29a742406f8a16e7b047f03
+  data.tar.gz: 7c81844112d211cfcfda8437df65b882c57fa0e4606ed0527e9381a4a53d790a
 SHA512:
-  metadata.gz: df918758478123b740874ff064bec9995678b92874594661bac2e255c4b3d119fb8aa275281ca85e5498c901f7922956e6dec1049e022c243f04f9e8a542964e
-  data.tar.gz: 8850cfa53d3f1eca39a170e6ca2208c757023f78a76271f0bd6db609101b658fa7359f7aabb17a740114f27a1f06d1a7b6273f9f95c9b8b1bb0a20675eb7a746
+  metadata.gz: 7a3e922f36813889f24938a62a803ed1cc8465a9a73bd9976676071216571cc99c6d99fadc6102b75b392386d69cb0baaa2297ee3ad03732b34644c21ed9f627
+  data.tar.gz: 79819eb036ce14b9d62e7de8a1c0341e9323f31382fb0e14ab6e6c671458c8fc4ce4e0234d78a8b827908f0ebed8920264428fe3d15abf5e75720fa53ac37923

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dude-cli (0.5.4)
+    dude-cli (0.6.1)
       colorize (~> 0.8)
       git (~> 1.3)
       gitlab (~> 4.3)
@@ -22,7 +22,7 @@ GEM
       terminal-table
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httparty (0.16.1)
+    httparty (0.16.2)
       multi_xml (>= 0.5.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)

data/lib/dude.rb

@@ -1,6 +1,2 @@
-require "dude/version"
-require "dude/gitlab"
-require "gitlab"
-
 module Dude
 end

data/lib/dude/cli.rb

@@ -1,11 +1,32 @@
 require 'thor'
-require "dude/version"
 require 'colorize'
-require_relative 'gitlab'
-require_relative 'git'
-require_relative 'toggl'
-require_relative 'settings'
-require_relative 'interface'
+require 'gitlab'
+require 'git'
+require 'rest_client'
+
+require 'dude/service'
+require 'dude/settings'
+require 'dude/interface'
+require 'dude/report'
+require 'dude/version'
+
+require 'dude/git/checkout'
+require 'dude/git/current_branch_name'
+
+require 'dude/gitlab/base'
+require 'dude/gitlab/estimate'
+require 'dude/gitlab/add_spend_time'
+require 'dude/gitlab/get_issue_title'
+require 'dude/gitlab/get_issue_info'
+require 'dude/gitlab/move_issue'
+require 'dude/gitlab/get_my_issues'
+require 'dude/gitlab/count_spend_time'
+
+require 'dude/toggl/base'
+require 'dude/toggl/report'
+require 'dude/toggl/issue_spend_time'
+require 'dude/toggl/start_time_entry'
+require 'dude/toggl/stop_time_entry'
 
 module Dude
   class CLI < Thor
@@ -24,9 +45,8 @@ module Dude
     desc 'checkout [ISSUE_ID]', 'checkout to branch with name "ID-issue-title"'
     def checkout(issue_id, project_title = folder_name)
       issue_title = get_issue_title(issue_id, project_title)
-      branch_name = git_branch_name(issue_title, issue_id)
-      git(branch_name).call
-      puts "Branch changed to '#{branch_name}'".colorize(:green)
+      branch_name = branch_name_for_issue(issue_title, issue_id)
+      Dude::Git::Checkout.call(branch_name: branch_name)
     end
 
     desc 'start [ISSUE_ID]', 'do checkout, track and move actions'
@@ -39,43 +59,65 @@ module Dude
     desc 'track [ISSUE_ID]', 'start task in Toggl with issue title'
     def track(issue_id, project_title = folder_name)
       issue_title = get_issue_title(issue_id, project_title)
-      Toggl.new(title: "##{issue_id} #{issue_title}", project_title: project_title).start_time_entry
-      puts "Toggl task '#{get_issue_title(issue_id, project_title)}' is started".colorize(:green)
+      Dude::Toggl::StartTimeEntry.call(
+        title: "#{issue_title} (##{issue_id})", project_title: project_title
+      )
     end
 
     desc 'tasks', 'Show issues in current project assigned to you'
     def tasks(project_title = folder_name)
-      issues = Gitlab.new(project_title: project_title).my_issues
+      issues = Dude::Gitlab::GetMyIssues.call(project_title: project_title)
       Interface.new.issues_list(issues)
     end
 
     desc 'estimate [DURATION] [ISSUE_ID]', 'estimate time'
     def estimate(duration, issue_id = current_issue_id, project_title = folder_name)
-      Gitlab.new(issue_id: issue_id, project_title: project_title).estimate_time(duration)
-      puts "Changed time estimate to #{duration}".colorize(:green)
+      Dude::Gitlab::Estimate.call(issue_id: issue_id, project_title: project_title, duration: duration)
+    end
+
+    desc 'spend [ISSUE_ID]', 'spend time'
+    def spend(issue_id = current_issue_id, project_title = folder_name)
+      old_data = Dude::Gitlab::CountSpendTime.call(issue_id: issue_id, project_title: project_title)
+      new_data = Dude::Toggl::IssueSpendTime.call(issue_id: issue_id, project_title: project_title)
+      diff = new_data - old_data
+      Dude::Gitlab::AddSpendTime.call(duration: diff, issue_id: issue_id, project_title: project_title)
     end
 
     desc 'stop', 'stop current time entry in Toggl, move issue to `To Do`'
-    def stop(project_title = folder_name)
-      Toggl.new.stop_current_time_entry
-      move('To Do', current_issue_id, project_title)
-      puts 'Work suspended'
+    def stop(issue_id = current_issue_id, project_title = folder_name)
+      Dude::Toggl::StopTimeEntry.call
+      move('To Do', issue_id, project_title)
+      spend(issue_id, project_title)
+      puts 'Work suspended'.colorize(:yellow)
+    end
+
+    desc 'finish', 'stop current time entry in Toggl, move issue to `To Verify`'
+    def finish(issue_id = current_issue_id, project_title = folder_name)
+      Dude::Toggl::StopTimeEntry.call
+      move('To Verify', issue_id, project_title)
+      spend(current_issue_id, project_title)
+      puts "Issue ##{current_issue_id} finished".colorize(:green)
     end
 
-    desc 'issue', 'Information about issue'
+    desc 'issue [ISSUE_ID]', 'Information about issue'
     def issue(issue_id = current_issue_id, project_title = folder_name)
-      Gitlab.new(issue_id: issue_id, project_title: project_title).issue_info
+      issue_info = Dude::Gitlab::GetIssueInfo.call(
+        issue_id: issue_id, project_title: project_title
+      )
+      Interface.new.draw_issue_info(issue_info)
     end
 
     desc 'stats', 'display your stats from Toggl'
     def stats
-      Toggl.new.report
+      report = Dude::Toggl::Report.call
+      Interface.new.draw_report(report)
     end
 
-    desc 'move', 'move issue to another column'
+    desc 'move [LABEL] [ISSUE_ID]', 'move issue to another column'
     def move(label, issue_id = current_issue_id, project_title = folder_name)
-      Gitlab.new(issue_id: issue_id, project_title: project_title, label: label).move_issue
-      puts "Issue ##{issue_id} moved to '#{label}'".colorize(:green)
+      Dude::Gitlab::MoveIssue.call(
+        issue_id: issue_id, project_title: project_title, label: label
+      )
     end
 
     desc 'version', 'Show version'
@@ -90,11 +132,11 @@ module Dude
     end
 
     def current_issue_id
-      Git.new.current_branch_name.chomp.split('-').first
+      Dude::Git::CurrentBranchName.call.chomp.split('-').first
     end
 
     def get_issue_title(issue_id, project_title)
-      Gitlab.new(issue_id: issue_id, project_title: project_title).issue_title
+      Dude::Gitlab::GetIssueTitle.call(issue_id: issue_id, project_title: project_title)
     end
 
     def duderc_file_content
@@ -107,7 +149,7 @@ module Dude
       @folder_name ||= File.basename(Dir.getwd)
     end
 
-    def git_branch_name(issue_title, issue_id)
+    def branch_name_for_issue(issue_title, issue_id)
       issue_title.downcase.gsub(/[^a-z0-9\-_]+/, '-').prepend("#{issue_id}-")
     end
   end

data/lib/dude/git/checkout.rb

@@ -0,0 +1,23 @@
+module Dude
+  module Git
+    class Checkout
+      include Service
+      def call
+        checkout if options[:branch_name]
+        print_message
+      end
+
+      def checkout
+        git.branch(options[:branch_name]).checkout
+      end
+
+      def print_message
+        puts "Branch changed to '#{options[:branch_name]}'".colorize(:green)
+      end
+
+      def git
+        @git ||= ::Git.init
+      end
+    end
+  end
+end

data/lib/dude/git/current_branch_name.rb

@@ -0,0 +1,10 @@
+module Dude
+  module Git
+    class CurrentBranchName
+      include Service
+      def call
+        %x(git rev-parse --abbrev-ref HEAD)
+      end
+    end
+  end
+end

data/lib/dude/gitlab/add_spend_time.rb

@@ -0,0 +1,36 @@
+module Dude
+  module Gitlab
+    class AddSpendTime < Dude::Gitlab::Base
+      def call
+        if duration_exists?
+          add_spend_time
+          print_success_message
+        else
+          print_error_message
+        end
+      end
+
+      def add_spend_time
+        ::Gitlab.add_time_spent_on_issue(
+          project_id, options[:issue_id], "#{options[:duration]}s"
+        )
+      end
+
+      def duration_exists?
+        options[:duration] > 0
+      end
+
+      def print_success_message
+        puts "Added #{formatted_time} to spent time"
+      end
+
+      def print_error_message
+        puts "Nothing to add".colorize(:yellow)
+      end
+
+      def formatted_time
+        Time.at(options[:duration]).utc.strftime('%H:%M:%S').to_s.colorize(:green)
+      end
+    end
+  end
+end

data/lib/dude/gitlab/base.rb

@@ -0,0 +1,38 @@
+module Dude
+  module Gitlab
+    class Base
+      include Service
+      include Settings
+
+      def initialize(*)
+        super
+        configure_gitlab
+      end
+
+      def check_input_data
+        throw_error if options[:issue_id].to_i.zero? || !issue_exists?
+      end
+
+      def throw_error
+        Interface.new.throw_error(options[:issue_id], options[:project_title])
+      end
+
+      def issue_exists?
+        !::Gitlab.issue(project_id, options[:issue_id]).nil?
+      rescue StandardError
+        nil
+      end
+
+      def project_id
+        @project_id ||= ::Gitlab.project_search(options[:project_title])[0]&.id
+      end
+
+      def configure_gitlab
+        ::Gitlab.configure do |config|
+          config.endpoint       = settings['GITLAB_ENDPOINT']
+          config.private_token  = settings['GITLAB_TOKEN']
+        end
+      end
+    end
+  end
+end

data/lib/dude/gitlab/count_spend_time.rb

@@ -0,0 +1,13 @@
+module Dude
+  module Gitlab
+    class CountSpendTime < Dude::Gitlab::Base
+      def call
+        time_stats.total_time_spent.to_i
+      end
+
+      def time_stats
+        ::Gitlab.time_stats_for_issue(project_id, options[:issue_id])
+      end
+    end
+  end
+end

data/lib/dude/gitlab/estimate.rb

@@ -0,0 +1,20 @@
+module Dude
+  module Gitlab
+    class Estimate < Dude::Gitlab::Base
+      def call
+        check_input_data
+        estimate_time
+      end
+
+      def estimate_time
+        ::Gitlab.estimate_time_of_issue(project_id, options[:issue_id], options[:duration])
+        Interface.new.draw_time_estimate(options[:duration])
+      end
+
+      # def human_time_estimate
+      #   ::Gitlab.issue(project_id, options[:issue_id]).
+      #     to_h['time_stats']['human_time_estimate']
+      # end
+    end
+  end
+end

data/lib/dude/gitlab/get_issue_info.rb

@@ -0,0 +1,9 @@
+module Dude
+  module Gitlab
+    class GetIssueInfo < Dude::Gitlab::Base
+      def call
+        ::Gitlab.issue(project_id, options[:issue_id]).to_h
+      end
+    end
+  end
+end

data/lib/dude/gitlab/get_issue_time_spent.rb

@@ -0,0 +1,9 @@
+module Dude
+  module Gitlab
+    class GetIssueInfo < Dude::Gitlab::Base
+      def call
+        ::Gitlab.issue(project_id, options[:issue_id]).to_h
+      end
+    end
+  end
+end

data/lib/dude/gitlab/get_issue_title.rb

@@ -0,0 +1,14 @@
+module Dude
+  module Gitlab
+    class GetIssueTitle < Dude::Gitlab::Base
+      def call
+        check_input_data
+        issue_title
+      end
+
+      def issue_title
+        ::Gitlab.issue(project_id, options[:issue_id]).title
+      end
+    end
+  end
+end

data/lib/dude/gitlab/get_my_issues.rb

@@ -0,0 +1,31 @@
+module Dude
+  module Gitlab
+    class GetMyIssues < Dude::Gitlab::Base
+      MAX_ISSUES_PER_PAGE = 300
+
+      def call
+        my_issues
+      end
+
+      def my_issues
+        all_issues_on_project.select {|a| a.last.eql?(user.id) }
+      end
+
+      def all_issues_on_project
+        ::Gitlab.issues(project_id, per_page: MAX_ISSUES_PER_PAGE).map do |a|
+          [a.iid, a.title, a.labels, assignees_id(a)]
+        end
+      end
+
+      def user
+        @user ||= ::Gitlab.user
+      end
+
+      def assignees_id(issue)
+        issue&.assignees&.first['id']
+      rescue NoMethodError
+        nil
+      end
+    end
+  end
+end

data/lib/dude/gitlab/move_issue.rb

@@ -0,0 +1,37 @@
+module Dude
+  module Gitlab
+    class MoveIssue < Dude::Gitlab::Base
+      DEFAULT_LABELS = ['To Do', 'Doing', 'To Verify'].freeze
+
+      def call
+        check_input_data
+        move_issue
+        print_message
+      end
+
+      def move_issue
+        ::Gitlab.edit_issue(project_id, options[:issue_id], labels_options)
+      end
+
+      def labels_options
+        { labels: new_issue_labels }
+      end
+
+      def all_issue_labels
+        ::Gitlab.issue(project_id, options[:issue_id]).labels
+      end
+
+      def default_issue_labels
+        all_issue_labels.reject {|e| DEFAULT_LABELS.include?(e)}
+      end
+
+      def new_issue_labels
+        default_issue_labels.push(options[:label]).join(',')
+      end
+
+      def print_message
+        puts "Issue ##{options[:issue_id]} moved to '#{options[:label]}'".colorize(:green)
+      end
+    end
+  end
+end

data/lib/dude/interface.rb

@@ -22,7 +22,7 @@ module Dude
     def draw_time_estimate(time)
       puts "Changed time estimate to #{time.colorize(:green)}"
     end
-    
+
     def draw_issue_info(info)
       issue_label = info['labels'].find do |label|
         ['To Do', 'Doing', 'To Verify'].include? label

data/lib/dude/report.rb

@@ -6,8 +6,8 @@ module Dude
     include Settings
     attr_reader :report
 
-    def initialize(report_json)
-      @report = JSON.parse(report_json.body)
+    def initialize(report)
+      @report = report
     end
 
     def week_time_worked

data/lib/dude/service.rb

@@ -0,0 +1,18 @@
+module Dude
+  module Service
+    attr_reader :options
+    def initialize(options = {})
+      @options = options
+    end
+
+    def self.included(klass)
+      klass.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      def call(options = {})
+        new(options).call
+      end
+    end
+  end
+end

data/lib/dude/toggl.rb

@@ -12,27 +12,11 @@ module Dude
       @options = options
     end
 
-    def report
-      report = Report.new(toggl_report.get params: report_params)
-      Interface.new.draw_report(report)
-    end
-
-    def start_time_entry
-      toggl_api['time_entries/start'].post time_entry_params(options[:title]).to_json, content_type: :json
-    end
 
     def stop_current_time_entry
       toggl_api["time_entries/#{current_time_entry['id']}/stop"].put ''
-    end
-
-    private
-
-    def report_params
-      {
-        workspace_id: settings['TOGGL_WORKSPACE_ID'],
-        user_agent: settings['TOGGL_EMAIL'],
-        since: Date.parse('monday').strftime('%Y-%m-%d')
-      }
+    rescue NoMethodError
+      puts 'No runned time entries in Toggl'.colorize(:yellow)
     end
 
     def time_entry_params(title)
@@ -45,23 +29,6 @@ module Dude
       }
     end
 
-    def project_id
-      projects_array.each do |arr|
-        return arr.last if arr.first.eql?(options[:project_title])
-      end
-      nil
-    end
-
-    def current_time_entry
-      JSON.parse(toggl_api['time_entries/current'].get)['data']
-    end
-
-    def projects_array
-      JSON.parse(
-        toggl_api["workspaces/#{settings['TOGGL_WORKSPACE_ID']}/projects"].get
-      ).map { |a| [a['name'].downcase.gsub(/\s/, '-'), a['id']] }
-    end
-
     def toggl_api
       @toggl_api ||= RestClient::Resource.new(
         'https://www.toggl.com/api/v8',
@@ -69,13 +36,5 @@ module Dude
         'api_token'
       )
     end
-
-    def toggl_report
-      @toggl_report ||= RestClient::Resource.new(
-        'https://www.toggl.com/reports/api/v2/weekly',
-        settings['TOGGL_TOKEN'],
-        'api_token'
-      )
-    end
   end
 end

data/lib/dude/toggl/base.rb

@@ -0,0 +1,28 @@
+module Dude
+  module Toggl
+    class Base
+      include Service
+      include Settings
+
+      def toggl_api
+        @toggl_api ||= RestClient::Resource.new(
+          'https://www.toggl.com/api/v8',
+          settings['TOGGL_TOKEN'],
+          'api_token'
+        )
+      end
+
+      def toggl_report
+        @toggl_report ||= RestClient::Resource.new(
+          'https://www.toggl.com/reports/api/v2/weekly',
+          settings['TOGGL_TOKEN'],
+          'api_token'
+        )
+      end
+
+      def projects_response
+        toggl_api["workspaces/#{settings['TOGGL_WORKSPACE_ID']}/projects"].get
+      end
+    end
+  end
+end

data/lib/dude/toggl/issue_spend_time.rb

@@ -0,0 +1,59 @@
+module Dude
+  module Toggl
+    class IssueSpendTime < Dude::Toggl::Base
+      def call
+        parse_time_entries_list
+      end
+
+      def params
+        {
+          workspace_id: settings['TOGGL_WORKSPACE_ID'],
+          user_agent: settings['TOGGL_EMAIL'],
+          start_date: '2013-03-10T15:42:46+02:00'
+        }
+      end
+
+      def response
+        toggl_api['time_entries'].get params
+      end
+
+      def time_entries
+        JSON.parse(response.body)
+      end
+
+      def current_issue_time_entries
+        time_entries.select { |entry| match_project_id?(entry) && match_issue_id?(entry) }
+      end
+
+      def match_project_id?(time_entry)
+        time_entry['pid'].eql? project_id
+      end
+
+      def match_issue_id?(time_entry)
+        # TODO: Deprecated behaviour
+        time_entry['description'].match?(/\(##{options[:issue_id]}\)/) ||
+          time_entry['description'].match?(/##{options[:issue_id]}\s/)
+      end
+
+      def formatted_time_entries
+        current_issue_time_entries.map {|a| [a['description'], a['duration']]}
+      end
+
+      def parse_time_entries_list
+        current_issue_time_entries.map {|a| a['duration'] }.sum
+      end
+
+      def project_id
+        # TODO: Concretize project selection
+        @project_id ||= projects_array.find do |title, id|
+          title.eql?(options[:project_title])
+        end.last
+      end
+
+      def projects_array
+        JSON.parse(projects_response)
+          .map { |a| [a['name'].downcase.gsub(/\s/, '-'), a['id']] }
+      end
+    end
+  end
+end

data/lib/dude/toggl/report.rb

@@ -0,0 +1,25 @@
+module Dude
+  module Toggl
+    class Report < Dude::Toggl::Base
+      def call
+        Dude::Report.new(parsed_response)
+      end
+
+      def response
+        toggl_report.get params: params
+      end
+
+      def params
+        {
+          workspace_id: settings['TOGGL_WORKSPACE_ID'],
+          user_agent: settings['TOGGL_EMAIL'],
+          since: Date.parse('monday').strftime('%Y-%m-%d')
+        }
+      end
+
+      def parsed_response
+        @parsed_response = JSON.parse(response.body)
+      end
+    end
+  end
+end

data/lib/dude/toggl/start_time_entry.rb

@@ -0,0 +1,47 @@
+module Dude
+  module Toggl
+    class StartTimeEntry < Dude::Toggl::Base
+
+      def call
+        start_time_entry
+        print_message
+      end
+
+      def start_time_entry
+        toggl_api['time_entries/start'].post(
+          time_entry_params(options[:title]),
+          content_type: :json
+        )
+      end
+
+      def time_entry_params(title)
+        {
+          time_entry: {
+            description: title,
+            pid: project_id,
+            created_with: 'dude'
+          }
+        }.to_json
+      end
+
+      def project_id
+        projects_array.each do |arr|
+          return arr.last if arr.first.eql?(options[:project_title])
+        end
+        nil
+      end
+
+      def projects_array
+        parsed_response.map { |a| [a['name'].downcase.gsub(/\s/, '-'), a['id']] }
+      end
+
+      def parsed_response
+        JSON.parse(projects_response)
+      end
+
+      def print_message
+        puts "Toggl task '#{options[:title]}' is started".colorize(:green)
+      end
+    end
+  end
+end

data/lib/dude/toggl/stop_time_entry.rb

@@ -0,0 +1,28 @@
+module Dude
+  module Toggl
+    class StopTimeEntry < Dude::Toggl::Base
+      def call
+        stop_current_time_entry
+        print_success_message
+      rescue NoMethodError
+        print_error_message
+      end
+
+      def stop_current_time_entry
+        toggl_api["time_entries/#{current_time_entry['id']}/stop"].put ''
+      end
+
+      def current_time_entry
+        JSON.parse(toggl_api['time_entries/current'].get)['data']
+      end
+
+      def print_success_message
+        puts 'Suspended current time entry in Toggl'.colorize(:green)
+      end
+
+      def print_error_message
+        puts 'No runned time entries in Toggl'.colorize(:yellow)
+      end
+    end
+  end
+end

data/lib/dude/version.rb

@@ -1,3 +1,3 @@
 module Dude
-  VERSION = "0.5.5"
+  VERSION = "0.6.2-rc1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dude-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.2.pre.rc1
 platform: ruby
 authors:
 - Nikita Pupko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,12 +159,27 @@ files:
 - dude.gemspec
 - lib/dude.rb
 - lib/dude/cli.rb
-- lib/dude/git.rb
-- lib/dude/gitlab.rb
+- lib/dude/git/checkout.rb
+- lib/dude/git/current_branch_name.rb
+- lib/dude/gitlab/add_spend_time.rb
+- lib/dude/gitlab/base.rb
+- lib/dude/gitlab/count_spend_time.rb
+- lib/dude/gitlab/estimate.rb
+- lib/dude/gitlab/get_issue_info.rb
+- lib/dude/gitlab/get_issue_time_spent.rb
+- lib/dude/gitlab/get_issue_title.rb
+- lib/dude/gitlab/get_my_issues.rb
+- lib/dude/gitlab/move_issue.rb
 - lib/dude/interface.rb
 - lib/dude/report.rb
+- lib/dude/service.rb
 - lib/dude/settings.rb
 - lib/dude/toggl.rb
+- lib/dude/toggl/base.rb
+- lib/dude/toggl/issue_spend_time.rb
+- lib/dude/toggl/report.rb
+- lib/dude/toggl/start_time_entry.rb
+- lib/dude/toggl/stop_time_entry.rb
 - lib/dude/version.rb
 homepage: https://github.com/Random4405/dude
 licenses:
@@ -181,9 +196,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3

data/lib/dude/git.rb

@@ -1,20 +0,0 @@
-require 'git'
-
-module Dude
-  class Git
-    attr_accessor :options
-
-    def initialize(options = {})
-      @options = options
-      @git = ::Git.init
-    end
-
-    def call
-      @git.branch(options[:branch_name]).checkout if options[:branch_name]
-    end
-
-    def current_branch_name
-      %x(git rev-parse --abbrev-ref HEAD)
-    end
-  end
-end

data/lib/dude/gitlab.rb

@@ -1,82 +0,0 @@
-require 'gitlab'
-require 'colorize'
-require_relative 'settings'
-require_relative 'interface'
-
-module Dude
-  class Gitlab
-    include Dude::Settings
-    attr_accessor :options
-
-    def initialize(options = {})
-      @options = options
-      ::Gitlab.configure do |config|
-        config.endpoint       = settings['GITLAB_ENDPOINT']
-        config.private_token  = settings['GITLAB_TOKEN']
-      end
-    end
-
-    def issue_title
-      test_input_data
-      ::Gitlab.issue(project_id, options[:issue_id]).title
-    end
-
-    def my_issues
-      all_issues_on_project.select {|a| a.last.eql?(user.id) }
-    end
-
-    def estimate_time(duration)
-      test_input_data
-      ::Gitlab.estimate_time_of_issue(project_id, options[:issue_id], duration)
-      time = ::Gitlab.issue(project_id, options[:issue_id]).
-        to_h['time_stats']['human_time_estimate']
-      Interface.new.draw_time_estimate(time)
-    end
-
-    def issue_info
-      test_input_data
-      issue_info = ::Gitlab.issue(project_id, options[:issue_id]).to_h
-      Interface.new.draw_issue_info(issue_info)
-    end
-
-    def move_issue
-      test_input_data
-      labels = ::Gitlab.issue(project_id, options[:issue_id]).labels
-      labels = labels.reject {|e| ['To Do', 'Doing', 'To Verify'].include?(e)}.
-        push(options[:label]).join(',')
-      ::Gitlab.edit_issue(project_id, options[:issue_id], { labels: labels })
-    end
-
-    private
-
-    def test_input_data
-      if options[:issue_id].to_i.zero? || !issue_exists?
-        Interface.new.throw_error(options[:issue_id], options[:project_title]) 
-      end
-    end
-
-    def issue_exists?
-      !::Gitlab.issue(project_id, options[:issue_id]).nil?
-    rescue
-      nil
-    end
-
-    def all_issues_on_project
-      ::Gitlab.issues(project_id).map {|a| [a.iid, a.title, a.labels, assignees_id(a)]}
-    end
-
-    def assignees_id(issue)
-      issue&.assignees&.first['id']
-    rescue NoMethodError
-      nil
-    end
-
-    def user
-      @my_id ||= ::Gitlab.user
-    end
-
-    def project_id
-      @project_id ||= ::Gitlab.project_search(options[:project_title])[0]&.id
-    end
-  end
-end