Merge pull request #592 from arthurnn/remove_taskmapper

Remove Taskmapper

Merge pull request #592 from arthurnn/remove_taskmapper
Remove Taskmapper
Cyril Mougel
2 parents e9326a9c 92c9b5c1
Showing 4 changed files with 16 additions and 16 deletions Show diff stats
Gemfile
Gemfile.lock
app/models/issue_trackers/unfuddle_tracker.rb
lib/issue_trackers/apis/unfuddle.rb
@@ -49,10 +49,6 @@ gem &#39;gitlab&#39;, :git =&gt; &#39;https://github.com/NARKOZ/gitlab.git&#39;
 # Bitbucket Issues
 gem 'bitbucket_rest_api', :require => false
  
-# Unfuddle
-gem "taskmapper"
-gem "taskmapper-unfuddle"
-
 # Jira
 gem 'jira-ruby', :require => 'jira'
  
@@ -331,13 +331,6 @@ GEM
       actionpack (~> 3.0)
       activemodel (~> 3.0)
       railties (~> 3.0)
-    taskmapper (1.0.1)
-      activeresource (~> 3.0)
-      activesupport (~> 3.0)
-      hashie (~> 2.0)
-    taskmapper-unfuddle (0.8.0)
-      addressable
-      taskmapper
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     therubyracer (0.12.0)
@@ -433,8 +426,6 @@ DEPENDENCIES
   ruby-fogbugz
   rushover
   strong_parameters
-  taskmapper
-  taskmapper-unfuddle
   therubyracer
   timecop
   turbo-sprockets-rails3
@@ -36,8 +36,8 @@ class IssueTrackers::UnfuddleTracker &lt; IssueTracker
   end
  
   def create_issue(problem, reported_by = nil)
-    unfuddle = TaskMapper.new(:unfuddle, :username => username, :password => password, :account => account)
  
+    Unfuddle.config(account, username, password)
     begin
       issue_options = {:project_id => project_id,
         :summary => issue_title(problem),
@@ -48,9 +48,9 @@ class IssueTrackers::UnfuddleTracker &lt; IssueTracker
  
       issue_options[:milestone_id] = milestone_id if milestone_id.present?
  
-      issue = unfuddle.project(project_id.to_i).ticket!(issue_options)
+      issue = Unfuddle::Ticket.create(issue_options)
       problem.update_attributes(
-                                :issue_link => File.join("#{url}/tickets/#{issue['id']}"),
+                                :issue_link => File.join("#{url}/tickets/#{issue.id}"),
                                 :issue_type => Label
                                 )
     rescue ActiveResource::UnauthorizedAccess
@@ -0,0 +1,13 @@
+require 'active_resource'
+
+module Unfuddle
+  class Ticket < ActiveResource::Base
+    self.format = :xml
+  end
+
+  def self.config(account, username, password)
+    Unfuddle::Ticket.site = "https://#{account}.unfuddle.com/api/v1/projects/:project_id"
+    Unfuddle::Ticket.user = username
+    Unfuddle::Ticket.password = password
+  end
+end
...	...	@@ -49,10 +49,6 @@ gem 'gitlab', :git => 'https://github.com/NARKOZ/gitlab.git'
49	49	# Bitbucket Issues
50	50	gem 'bitbucket_rest_api', :require => false
51	51
52		-# Unfuddle
53		-gem "taskmapper"
54		-gem "taskmapper-unfuddle"
55		-
56	52	# Jira
57	53	gem 'jira-ruby', :require => 'jira'
58	54
...	...
...	...	@@ -331,13 +331,6 @@ GEM
331	331	actionpack (~> 3.0)
332	332	activemodel (~> 3.0)
333	333	railties (~> 3.0)
334		- taskmapper (1.0.1)
335		- activeresource (~> 3.0)
336		- activesupport (~> 3.0)
337		- hashie (~> 2.0)
338		- taskmapper-unfuddle (0.8.0)
339		- addressable
340		- taskmapper
341	334	term-ansicolor (1.2.2)
342	335	tins (~> 0.8)
343	336	therubyracer (0.12.0)
...	...	@@ -433,8 +426,6 @@ DEPENDENCIES
433	426	ruby-fogbugz
434	427	rushover
435	428	strong_parameters
436		- taskmapper
437		- taskmapper-unfuddle
438	429	therubyracer
439	430	timecop
440	431	turbo-sprockets-rails3
...	...
...	...	@@ -36,8 +36,8 @@ class IssueTrackers::UnfuddleTracker < IssueTracker
36	36	end
37	37
38	38	def create_issue(problem, reported_by = nil)
39		- unfuddle = TaskMapper.new(:unfuddle, :username => username, :password => password, :account => account)
40	39
	40	+ Unfuddle.config(account, username, password)
41	41	begin
42	42	issue_options = {:project_id => project_id,
43	43	:summary => issue_title(problem),
...	...	@@ -48,9 +48,9 @@ class IssueTrackers::UnfuddleTracker < IssueTracker
48	48
49	49	issue_options[:milestone_id] = milestone_id if milestone_id.present?
50	50
51		- issue = unfuddle.project(project_id.to_i).ticket!(issue_options)
	51	+ issue = Unfuddle::Ticket.create(issue_options)
52	52	problem.update_attributes(
53		- :issue_link => File.join("#{url}/tickets/#{issue['id']}"),
	53	+ :issue_link => File.join("#{url}/tickets/#{issue.id}"),
54	54	:issue_type => Label
55	55	)
56	56	rescue ActiveResource::UnauthorizedAccess
...	...
...	...	@@ -0,0 +1,13 @@
	1	+require 'active_resource'
	2	+
	3	+module Unfuddle
	4	+ class Ticket < ActiveResource::Base
	5	+ self.format = :xml
	6	+ end
	7	+
	8	+ def self.config(account, username, password)
	9	+ Unfuddle::Ticket.site = "https://#{account}.unfuddle.com/api/v1/projects/:project_id"
	10	+ Unfuddle::Ticket.user = username
	11	+ Unfuddle::Ticket.password = password
	12	+ end
	13	+end
...	...