dude-cli 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1b1363a91b57a06932df8d4b80be8b7a709e694
-  data.tar.gz: 9e65b6ffa950cfd5c4a14e53872040385cb06a88
+  metadata.gz: 94e6437616a753a65881406ba1ff48d589adb3c2
+  data.tar.gz: 79f21de88cba3c52642dcb49d9955a7da823fee2
 SHA512:
-  metadata.gz: 54999e8a1a98d83a94fb3442bc98d06101a54836426b0e5f22e1b3eed4dcfc1035568920b921ddd60b81b00fecfd36763e35b55cb8006653342e91cb56fa15f3
-  data.tar.gz: f65cb5832180d149fde8d9af81a24468c2fdf747c7174c6ce55ab0f80ce39d9091efbf1ee919975822ca5a9b8aecdcd642d6b6720e50a62c0e3e7e267315eeac
+  metadata.gz: fafe9d6d4eba6c8ef9f4ee2543f0da5f0b3573b40e79f95f84c845e0edb74587325ed17d5ec90a39f35e37d0370416aa3b4c27f14702b8b1964ca08fe30a60c2
+  data.tar.gz: 8c0c06316e8286b2e861461e3bcdcd5c54ce0be92fb9d66db5602867d24c32633f3619e389f3f1e2b14c33bfec00ba7ac7e6dc9075026e0d2bb21e4f8da290b6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dude-cli (0.2.4)
+    dude-cli (0.4.0)
       colorize (~> 0.8)
       git (~> 1.3)
       gitlab (~> 4.2)

data/README.md

@@ -1,8 +1,6 @@
-# Dude
+# Dude [![Gem Version](https://badge.fury.io/rb/dude-cli.svg)](https://badge.fury.io/rb/dude-cli)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/dude`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+A daily assistant in the hard work of a programmer
 
 ## Installation
 
@@ -20,19 +18,41 @@ Or install it yourself as:
 
     $ gem install dude-cli
 
+After that create .duderc file in your HOME directory by command:
+
+    $ dude install
+
+And configure all variables in this file 
+
+`TOGGL_EMAIL` - Your email, registered in Toggl
+
+`TOGGL_TOKEN=` - Your Toggl [token](https://toggl.com/app/profile)
+
+`TOGGL_WORKSPACE_ID` - Your Toggl Workspace ID (You can find it in Toggl [team](https://toggl.com/app/team) or [projects](https://toggl.com/app/projects/) url)
+
+`GITLAB_ENDPOINT=https://gitlab.yoursite.com/api/v4/` - Change yoursite.com to your site
+
+`GITLAB_TOKEN=imyiKqwsQBbn1zCMY2PJ` - Your Gitlab token (<https://gitlab.yoursite.com/profile/personal_access_tokens>)
+
+`HOURS_PER_DAY=8` - Work hours per day
+
+`HOURS_PER_WEEK=40` - Work hours per week
+
 ## Usage
 
-TODO: Write usage instructions here
+All commands will be described here later, but how you can use `dude help` for short description of every command.
+
+<!-- TODO: Write usage instructions here -->
 
-## Development
+<!-- ## Development -->
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+<!-- After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment. -->
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+<!-- To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org). -->
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/dude.
+Bug reports and pull requests are welcome on GitHub at https://github.com/Random4405/dude.
 
 ## License
 

data/lib/dude/cli.rb

@@ -67,7 +67,7 @@ module Dude
     end
 
     def get_issue_title(issue_id, project_title)
-      Gitlab.new(issue_id: issue_id, project_title: project_title).call
+      Gitlab.new(issue_id: issue_id, project_title: project_title).issue_title
     end
 
     def duderc_file_content

data/lib/dude/gitlab.rb

@@ -1,5 +1,5 @@
 require 'gitlab'
-require 'rest-client'
+require 'colorize'
 require_relative 'settings'
 require_relative 'interface'
 
@@ -16,39 +16,53 @@ module Dude
       end
     end
 
-    def call
+    def issue_title
+      test_input_data
       ::Gitlab.issue(project_id, options[:issue_id]).title
-    rescue StandardError
-      puts "Issue ##{options[:issue_id]} not found " \
-        "in project #{options[:project_title]}\n" \
-        "Please, check the entered issue_id and project"
     end
 
     def my_issues
-      ::Gitlab.issues(project_id).select.map {|a| [a.iid, a.title, a.labels]}
+      all_issues_on_project.select {|a| a.last.eql?(user.id) }
     end
 
     def estimate_time(duration)
-      issue_resource['time_estimate'].post duration: 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
-      issue_info = JSON.parse(issue_resource.get.body)
+      test_input_data
+      issue_info = ::Gitlab.issue(project_id, options[:issue_id]).to_h
       Interface.new.draw_issue_info(issue_info)
     end
 
     private
 
-    def issue_link
-      @issue_link ||= ::Gitlab.issue(project_id, options[:issue_id])._links.self.gsub(/http/, 'https')
+    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, a.assignee&.id]}
     end
 
-    def issue_resource
-      @issue_resource ||= RestClient::Resource.new(issue_link, headers: { 'PRIVATE-TOKEN': settings['GITLAB_TOKEN'] })
+    def user
+      @my_id ||= ::Gitlab.user
     end
 
     def project_id
-      @project_id ||= ::Gitlab.project_search(options[:project_title])[0].id
+      @project_id ||= ::Gitlab.project_search(options[:project_title])[0]&.id
     end
   end
 end

data/lib/dude/interface.rb

@@ -11,6 +11,17 @@ module Dude
       puts ''
       report_daily
     end
+
+    def throw_error(issue_id, project_title)
+      puts "Something went wrong. Please, check input data\n".colorize(:red) +
+        "Project: #{project_title.to_s.bold}\n" +
+        "Issue ID: #{issue_id.to_s.bold}"
+      exit
+    end
+
+    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|
@@ -38,7 +49,7 @@ module Dude
     def issues_list(issues)
       [['To Do', :yellow], ['Doing', :green], ['To Verify', :blue]].each do |group, color|
         puts "#{group}:".colorize(color).bold
-        grouped = issues.select {|i| i.last.include?(group)}
+        grouped = issues.select {|i| i[2].include?(group)}
         if grouped.length.zero?
           puts 'Nothing'
         else

data/lib/dude/version.rb

@@ -1,3 +1,3 @@
 module Dude
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dude-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nikita Pupko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler