ruboty-redmine 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 759100cbf0b5752c77f02070110eaf87240727f0
-  data.tar.gz: e486952501594a90cc2336d14ec24b5985c73c02
+  metadata.gz: f7b949437ad33ddc3f084f4935d491f1659a9080
+  data.tar.gz: c6b65f85a6ee55633a84d36dbe0ce742132f61c2
 SHA512:
-  metadata.gz: d0782d74534eb79f1b85031ae08c9dce588564bb50673784d45028c2137dd612b6cd71a8fdf9d7c254b74d0d7de50e37a475941c7d0897fbac251eb2bc43171a
-  data.tar.gz: 096427b5f830ba198df16fddb8d63ee90c5a4a8cd3be207be6d3a9247fe9d926e63bd22ba0797fd3a27cacab70d5d23fcde4ecd615d72fe86e32c50550ea90be
+  metadata.gz: 67de7f066296931d87e79694ccc5431a1e3c58f043f6819c0888a77332cedfb1cba9f1351d8f02bc4d18219dc2c4d8f7bd97b9ad615203dfdf0cddb3be18b680
+  data.tar.gz: 8412ba9bfdaa01495ea3c8ab46b86f98983e395c9e8e11553650e26ed136b1716eeaaf45c48243a396271d3fd22220d9de9f83aa10a3f5c30d780217b1e2a6c9

data/lib/ruboty/handlers/redmine.rb

@@ -8,6 +8,7 @@ module Ruboty
       env :REDMINE_BASIC_AUTH_USER, 'Basic Auth User', optional: true
       env :REDMINE_BASIC_AUTH_PASSWORD, 'Basic Auth Password', optional: true
       env :REDMINE_CHECK_INTERVAL, 'Interval to check new issues', optional: true
+      env :REDMINE_HTTP_PROXY, 'HTTP proxy', optional: true
 
       on(
         /create issue (?<rest>.+)/,
@@ -163,7 +164,12 @@ module Ruboty
           return
         end
 
-        absent_users << u.to_i
+        if absent_users.include?(u)
+          message.reply("Assigning to #{message[:user]} is already stopped")
+          return
+        end
+
+        absent_users << u
         message.reply("Stop assigning issues to #{u}")
       end
 
@@ -174,12 +180,17 @@ module Ruboty
           return
         end
 
-        absent_users.delete(u.to_i)
+        unless absent_users.include?(u)
+          message.reply("Assigning to #{message[:user]} is not stopped")
+          return
+        end
+
+        absent_users.delete(u)
         message.reply("Start assigning issues to #{u}")
       end
 
       def list_absent_users(message)
-        message.reply(absent_users.map(&:to_s).join(", "))
+        message.reply(absent_users.map {|id| redmine_id_to_username(id) }.join(", "))
       end
 
       private
@@ -193,8 +204,15 @@ module Ruboty
             u['chat_name'] == username
           end
 
-          u && u['redmine_id']
+          u && u['redmine_id'].to_i
+        end
+      end
+
+      def redmine_id_to_username(redmine_id)
+        u = users.find do |u|
+          u['redmine_id'] == redmine_id.to_i
         end
+        u && u['chat_name']
       end
 
       def redmine
@@ -203,6 +221,7 @@ module Ruboty
           ENV['REDMINE_API_KEY'],
           basic_auth_user: ENV['REDMINE_BASIC_AUTH_USER'],
           basic_auth_password: ENV['REDMINE_BASIC_AUTH_PASSWORD'],
+          http_proxy: ENV['REDMINE_HTTP_PROXY'],
         )
       end
 

data/lib/ruboty/redmine/client.rb

@@ -86,7 +86,10 @@ module Ruboty
       private
 
       def conn
-        conn = Faraday.new(url: @url) do |faraday|
+        new_options = {url: @url}
+        new_options[:proxy] = @options[:http_proxy] if @options[:http_proxy]
+
+        conn = Faraday.new(new_options) do |faraday|
           faraday.request  :url_encoded
           faraday.response :logger if ENV['DEBUG']
           faraday.adapter  Faraday.default_adapter

data/lib/ruboty/redmine/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Redmine
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-redmine
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Redmine plugin for Ruboty