stand 1.0.5.pre → 1.0.5.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1581405b5f4259517d6ce01e49419d2ceac48705
-  data.tar.gz: f73bc828a150e6b6815ace3b68f945ef5c0ba0ce
+  metadata.gz: 918e4803f3d7d64990882e29154023325df9f2fe
+  data.tar.gz: f9707445e4e0f4b8ea7f03a2416b0506d8be4aee
 SHA512:
-  metadata.gz: dda6e68db4d53394729f28f52d3294736b05338231b937643bdef12c1fde548a93921adb6ad93b16d0c3bdad3e3933c41b3e41e10fe506c43e812501ac6051e6
-  data.tar.gz: dcf060afa8f9d5bf2733c6900afaab74c325e2a007c734b2746e85412c6b2174324d735dfb25e710ab92e04e79a1bcda60a8bc6e5aedda107d03d5d5fc690f82
+  metadata.gz: b6ab15680612878db88f41a02bf5fc3f516cc93a26bf726356ffeb4723be9139a42103536d428331f7abf6be87cdbe17af84efbc65aa0d4e8d9dbbfcca3e94c5
+  data.tar.gz: a60e52c06f6ecf24ced9c4f05690e1fad6fa41bc30a61755b2cf64d1d1ce6a4212108f3da6ee8ad5e9c55bc11f23f4adc721f68858b2fcab22eb409588ee3624

data/lib/standup.rb

@@ -2,5 +2,10 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'active_support/core_ext/time'
 require 'active_support/core_ext/numeric/time'
 
+module Standup
+  BASE_NAME = 'standup'.freeze
+end
+
+require 'standup/cache'
 require 'standup/version'
 require 'standup/app'

data/lib/standup/app.rb

@@ -11,7 +11,7 @@ module Standup
     DESCRIPTION = 'Fetchs data from gitlab to report what you have done'
 
     def initialize
-      config.config_file_base_name = 'standup'
+      config.config_file_base_name = Standup::BASE_NAME
       config.describes_application app_name: NAME,
                                    app_version: Standup::VERSION,
                                    app_description: DESCRIPTION
@@ -22,14 +22,15 @@ module Standup
       config.add_command_line_section('Application Options') do |s|
         s.on :from,     'From specific day', argument: true
         s.on :to,       'To specific day',   argument: true
-        s.on :username, 'Username',          argument: true
       end
     end
 
     def run
       settings = ConfigParser.new(config)
 
-      ReportGenerator.new(settings).gitlab_report!
+      Standup::Cache.use_cassette("gitlab", re_record_interval: (settings.to_date - settings.from_date) / 10) do
+        ReportGenerator.new(settings).gitlab_report!
+      end
     end
   end
 end

data/lib/standup/cache.rb

@@ -0,0 +1,17 @@
+require 'vcr'
+
+module Standup
+  Cache = VCR
+end
+
+Standup::Cache.configure do |c|
+  c.cassette_library_dir = "#{File.expand_path('~')}/.#{Standup::BASE_NAME}/cache"
+  c.hook_into :webmock
+  c.default_cassette_options = {
+    re_record_interval: 1.day,
+    record: :new_episodes
+  }
+  c.ignore_request do |request|
+    request.method != :get
+  end
+end

data/lib/standup/config_parser.rb

@@ -17,8 +17,7 @@ module Standup
     private
 
     def validate_config!
-      fail 'Please provide a --username parameter' unless config[:username]
-      fail 'Please provide a Gitlab access token in your configuration file' unless config['gitlab_access_token']
+      fail "Please provide a Gitlab access token in your configuration file 'gitlab_access_token missing'" unless config['gitlab_access_token']
     end
 
     def help_needed?

data/lib/standup/report_generator.rb

@@ -14,57 +14,81 @@ module Standup
     end
 
     def gitlab_report!
+      # Get authenticated user
+      config[:username] = Gitlab.user.username
+
       projects_query = {
-        per_page: 10,
+        per_page: 20,
         membership: true,
         search: config['gitlab_project_search_pattern'],
         order_by: :last_activity_at,
         sort: :desc
       }
 
-      mrs_query = {
+      created_mrs_query = {
         per_page: 100,
         state: :merged,
         order_by: :updated_at,
-        sort: :desc
+        sort: :desc,
+        scope: 'created-by-me'
       }
+      assigned_mrs_query = created_mrs_query.dup
+      assigned_mrs_query[:scope] = 'assigned-to-me'
 
-      issues_query = {
+      assigned_issues_query = {
         per_page: 100,
         state: :closed,
         order_by: :updated_at,
-        sort: :desc
+        sort: :desc,
+        scope: 'assigned-to-me'
       }
 
       projects = Gitlab.projects(projects_query)
 
       projects.each do |project|
+        merged_mrs = []
+        closed_issues = []
+
+        if config[:verbose]
+          puts "Scanning project #{project.namespace.name}/#{project.name} (#{project.id})"
+        end
+
         begin
-          merged_mrs = Gitlab.merge_requests(project.id, mrs_query)
-        rescue Gitlab::Error::Forbidden
+          Gitlab.merge_requests(project.id, created_mrs_query).auto_paginate do |mr|
+            merged_mrs << mr
+          end
+          Gitlab.merge_requests(project.id, assigned_mrs_query).auto_paginate do |mr|
+            merged_mrs << mr
+          end
+        rescue Gitlab::Error::Forbidden => e
           # Don't seem to have acces to some MRs
-          merged_mrs = []
+          if config[:verbose]
+            puts "Error while fetching merge requests from project #{project.name} (#{project.id}): #{e.inspect}"
+          end
         end
 
         begin
-          closed_issues = Gitlab.issues(project.id, issues_query)
-        rescue Gitlab::Error::Forbidden
-          closed_issues = []
+          Gitlab.issues(project.id, assigned_issues_query).auto_paginate do |issue|
+            closed_issues << issue
+          end
+        rescue Gitlab::Error::Forbidden => e
+          if @settings.config[:verbose]
+            puts "Error while fetching issues from project #{project.name} (#{project.id}): #{e.inspect}"
+          end
         end
 
         merged_mrs.each do |mr|
-          validate_state(project, mr, 'MR')
+          validate_result!(project, mr, 'MR')
         end
 
         closed_issues.each do |issue|
-          validate_state(project, issue, 'ISSUE')
+          validate_result!(project, issue, 'ISSUE')
         end
       end
 
       puts Terminal::Table.new :title => 'DONE', :headings => [ 'PROJECT', 'TYPE', 'ID', 'TITLE' ], :rows => @result['done']
       puts "\n"
       puts Terminal::Table.new :title => 'REVIEWED', :headings => [ 'PROJECT', 'TYPE', 'ID', 'TITLE' ], :rows => @result['reviewed']
-
     end
 
     private
@@ -81,7 +105,7 @@ module Standup
       @settings.from_date
     end
 
-    def validate_state(project, event, type='?')
+    def validate_result!(project, event, type='?')
       updated_at = Time.parse(event.updated_at)
       author     = event.author.username
       assignee   = event.assignee && event.assignee.username
@@ -96,7 +120,7 @@ module Standup
     end
 
     def configure_gitlab_client
-      api_endpoint = config['gitlab_endpoint'] || 'https://gitlab.com/api/v3'.freeze
+      api_endpoint = config['gitlab_endpoint'] || 'https://gitlab.com/api/v4'.freeze
 
       Gitlab.configure do |c|
         c.endpoint = api_endpoint

data/lib/standup/version.rb

@@ -1,3 +1,3 @@
 module Standup
-  VERSION = '1.0.5.pre'
+  VERSION = '1.0.5.pre2'
 end

data/stand.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport'
   s.add_dependency 'gitlab'
   s.add_dependency 'terminal-table'
+  s.add_dependency 'vcr', '>= 3.0'
 
   s.add_development_dependency 'pry'
   s.add_development_dependency 'guard'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stand
 version: !ruby/object:Gem::Version
-  version: 1.0.5.pre
+  version: 1.0.5.pre2
 platform: ruby
 authors:
 - Paul Bonaud
@@ -68,6 +68,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +308,7 @@ files:
 - bin/standup
 - lib/standup.rb
 - lib/standup/app.rb
+- lib/standup/cache.rb
 - lib/standup/config_parser.rb
 - lib/standup/report_generator.rb
 - lib/standup/version.rb