taskmapper-jira 0.3.0 → 0.3.1

data/Gemfile

@@ -1,7 +1,7 @@
 source :rubygems
 
 gem 'taskmapper', "~> 0.8"
-gem 'jira4r-jh', "~> 0.4"
+gem 'jira4r-jh-ruby1.9', "~> 0.4"
 
 group :test, :development do
   gem "rspec", "~> 2.8"

data/Gemfile.lock

@@ -1,40 +1,38 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     builder (3.0.0)
     diff-lcs (1.1.3)
     hashie (1.2.0)
-    httpclient (2.2.3)
     i18n (0.6.0)
-    jira4r-jh (0.4.0)
-      soap4r
-      soap4r
-    multi_json (1.1.0)
+    jira4r-jh-ruby1.9 (0.4.0)
+      soap4r-ruby1.9
+      soap4r-ruby1.9
+    multi_json (1.3.6)
     rake (0.9.2.2)
     rcov (1.0.0)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.6.1)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    soap4r (1.5.8)
-      httpclient (>= 2.1.1)
+    soap4r-ruby1.9 (2.0.5)
     taskmapper (0.8.0)
       activeresource (~> 3.0)
       activesupport (~> 3.0)
@@ -44,7 +42,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jira4r-jh (~> 0.4)
+  jira4r-jh-ruby1.9 (~> 0.4)
   rake (~> 0.9.2)
   rcov (~> 1.0)
   rspec (~> 2.8)

data/Rakefile

@@ -1,10 +1,8 @@
-require 'bundler/setup'
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-task :default => :spec
+RSpec::Core::RakeTask.new
 
-desc "run specs"
-task :spec do
-  sh "bundle exec rspec --color spec/"
-end
+task :default => :spec
+task :test => :spec
 

data/lib/jira/version.rb

@@ -1,5 +1,5 @@
 class TaskMapper
   module Jira
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/provider/comment.rb

@@ -28,12 +28,6 @@ module TaskMapper::Provider
         end
       end
 
-      def self.find(ticket_id, *options)
-        if options.first.empty?
-          self.find_all(ticket_id)
-        end
-      end
-
       def self.find_all(ticket_id)
         begin 
           $jira.getComments("#{ticket_id}").map { |comment| self.new comment }
@@ -41,6 +35,14 @@ module TaskMapper::Provider
           []
         end
       end
+
+      def self.find_by_attributes(project_id, ticket_id, attributes = {}) 
+        search_by_attribute(self.find_all(ticket_id), attributes)
+      end
+
+      def self.find_by_id(project_id, ticket_id, id) 
+        self.find_all(ticket_id).find { |comment| comment.id == id }
+      end
     end
   end
 end

data/lib/provider/jira.rb

@@ -37,10 +37,6 @@ module TaskMapper::Provider
       end
     end
 
-    def projects(*options)
-      Project.find(options)
-    end
-
     def valid?
       @valid_auth
     end

data/lib/provider/project.rb

@@ -38,18 +38,6 @@ module TaskMapper::Provider
         end
       end
 
-      def self.find(*options)
-        if options[0].first.is_a? Array
-          self.find_all.select do |project| 
-            project if options.first.any? { |id| project.id == id }
-          end
-        elsif options[0].first.is_a? Hash
-          find_by_attributes(options[0].first)
-        else
-          self.find_all
-        end
-      end
-
       def self.find_by_attributes(attributes = {})
         search_by_attribute(self.find_all, attributes)
       end

data/lib/provider/ticket.rb

@@ -45,7 +45,7 @@ module TaskMapper::Provider
       end
 
       def self.find_by_id(project_id, id)
-        self.find_all(project_id).select { |ticket| ticket.id == id }.first
+        self.find_all(project_id).find { |ticket| ticket.id == id }
       end
 
       def self.find_all(project_id)
@@ -54,10 +54,6 @@ module TaskMapper::Provider
         end
       end
 
-      def comments(*options)
-        Comment.find(self.id, options)
-      end
-
       def comment(*options)
         nil
       end

data/spec/comment_spec.rb

@@ -1,11 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe TaskMapper::Provider::Jira::Comment do
-  before(:each) do
-    @url = "some_url"
-    @fj = FakeJiraTool.new
-    @project_jira = Struct.new(:id, :name, :description).new(1, 'project', 'project description')
-    @ticket = Struct.new(:id, 
+  let(:url) { 'http://jira.atlassian.com' }
+  let(:fake_jira) { FakeJiraTool.new }
+  let(:project_from_jira) { Struct.new(:id, :name, :description).new(1, 'project', 'project description') }
+  let(:ticket_from_jira) do 
+              Struct.new(:id, 
                          :status, 
                          :priority, 
                          :summary, 
@@ -13,27 +13,37 @@ describe TaskMapper::Provider::Jira::Comment do
                          :created, 
                          :updated, 
                          :description, :assignee, :reporter).new(1,'open','high', 'ticket 1', 'none', Time.now, Time.now, 'description', 'myself', 'yourself')
-    @comment = Struct.new(:id, :author, :body, :created, :updated, :ticket_id, :project_id).new(1,
-                                                                                                      'myself',
-                                                                                                      'body',
-                                                                                                      Time.now,
-                                                                                                      Time.now,
-                                                                                                      1,
-                                                                                                      1)
-    Jira4R::JiraTool.stub!(:new).with(2, @url).and_return(@fj)
-    @fj.stub!(:getProjectsNoSchemes).and_return([@project_jira, @project_jira])
-    @fj.stub!(:getProjectById).and_return(@project_jira)
-    @fj.stub!(:getIssuesFromJqlSearch).and_return([@ticket])
-    @fj.stub!(:getComments).and_return([@comment])
-    @tm = TaskMapper.new(:jira, :username => 'testuser', :password => 'testuser', :url => @url)
-    @ticket = @tm.projects.first.tickets.first
-    @klass = TaskMapper::Provider::Jira::Comment
   end
-
-  it "should be able to load all comments" do 
-    @ticket.comments.should be_an_instance_of(Array)
-    @ticket.comments.first.should be_an_instance_of(@klass)
+  let(:comment_from_jira) do
+            Struct.new(:id, :author, :body, :created, :updated, :ticket_id, :project_id).new(1,'myself','body',Time.now,Time.now,1,1)
+  end
+  let(:tm) { TaskMapper.new :jira, :username => 'soaptester', :password => 'soaptester', :url => url }
+  let(:ticket) { tm.project(1).ticket(1) }
+  let(:comment_class) { TaskMapper::Provider::Jira::Comment }
+  let(:comment_id) { 1 }
+  before(:each) do
+    Jira4R::JiraTool.stub!(:new).with(2, url).and_return(fake_jira)
+    fake_jira.stub!(:getProjectsNoSchemes).and_return([project_from_jira, project_from_jira])
+    fake_jira.stub!(:getProjectById).and_return(project_from_jira)
+    fake_jira.stub!(:getIssuesFromJqlSearch).and_return([ticket_from_jira])
+    fake_jira.stub!(:getComments).and_return([comment_from_jira])
   end
 
-  it "should be able to create a comment"
+  describe "Retrieving comments" do 
+    context "when #comments" do 
+      subject { ticket.comments } 
+      it { should be_an_instance_of Array }
+
+      context "when #comments.first" do 
+        subject { ticket.comments.first } 
+        it { should be_an_instance_of comment_class }
+      end
+    end
+
+    context "when #comments with id's" do 
+      subject { ticket.comments [comment_id] }
+      it { should be_an_instance_of Array }
+    end
+
+  end
 end

data/spec/fixtures/projects.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<soap:Envelope
+  xmlns:soap="http://www.w3.org/2001/12/soap-envelope"
+  soap:encodingStyle="http://www.w3.org/2001/12/soap-encoding">
+  <projects>
+    <project>
+      <id>10</id>
+      <name>Project Test</name>
+    </project>
+  </projects>
+</soap:Envelope>

data/spec/project_spec.rb

@@ -1,46 +1,51 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe TaskMapper::Provider::Jira::Project do 
+
+  let(:backend_url) { 'http://jira.atlassian.com' }
+  let(:tm) { TaskMapper.new(:jira, :username => 'soaptester', :password => 'soaptester', :url => backend_url) }
+  let(:fake_jira) { FakeJiraTool.new }
+  let(:returned_project) { Struct.new(:id, :name, :description).new(1, 'project', 'project description') }
+  let(:project_class) { TaskMapper::Provider::Jira::Project }
+  let(:project_id) { 1 }
   before(:each) do
-    @url = "some_url"
-    @fj = FakeJiraTool.new
-    @project = Struct.new(:id, :name, :description).new(1, 
-                                                        'project', 
-                                                        'project description')
-    Jira4R::JiraTool.stub!(:new).with(2, @url).and_return(@fj)
-    @fj.stub!(:getProjectsNoSchemes).and_return([@project, @project])
-    @fj.stub!(:getProjectByKey).and_return(@project)
-    @tm = TaskMapper.new(:jira, :username => 'testuser', :password => 'testuser', :url => @url)
-    @klass = TaskMapper::Provider::Jira::Project
+    Jira4R::JiraTool.stub!(:new).with(2, backend_url).and_return(fake_jira)
+    fake_jira.stub!(:getProjectsNoSchemes).and_return([returned_project, returned_project])
+    fake_jira.stub!(:getProjectByKey).and_return(returned_project)
   end
 
-  it "should be able to load all projects" do
-    @tm.projects.should be_an_instance_of(Array)
-    @tm.projects.first.should be_an_instance_of(@klass)
-  end
+  describe "Retrieving projects" do 
+    context "when #projects" do 
+      subject { tm.projects } 
+      pending { should be_an_instance_of Array }
+    end
 
-  it "should be able to load all projects based on an array of id's" do 
-    @tm.projects([1]).should be_an_instance_of(Array)
-    @tm.projects.first.should be_an_instance_of(@klass)
-    @tm.projects.first.id.should == 1
-  end
+    context "when #projects with array of id's" do 
+      subject { tm.projects [project_id] }
+      it { should be_an_instance_of Array }
+    end
 
-  it "should be load all projects based on attributes" do 
-    projects = @tm.projects(:id => 1)
-    projects.should be_an_instance_of(Array)
-    projects.first.should be_an_instance_of(@klass)
-    projects.first.id.should == 1
-  end
+    context "when #projects with attributes" do 
+      subject { tm.projects :id => project_id }
+      it { should be_an_instance_of Array }
+    end
 
-  it "should be able to load a single project based on id" do
-    project = @tm.project(1)
-    project.should be_an_instance_of(@klass)
-    project.name.should == 'project'
-  end
+    describe "Retrieving a single project" do 
+      context "when #project with id" do 
+        subject { tm.project project_id } 
+        it { should be_an_instance_of project_class } 
+
+        context "when #project.name" do 
+          subject { tm.project(project_id).name } 
+          it { should_not be_nil } 
+          it { should be_eql('project') } 
+        end
+      end
 
-  it "should be able to load a single project by attributes" do
-    project = @tm.project(:id => 1)
-    project.should be_an_instance_of(@klass)
-    project.name.should == 'project'
+      context "when #project with attribute" do 
+        subject { tm.project :id => project_id } 
+        it { should be_an_instance_of project_class }
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'taskmapper'
 require 'taskmapper-jira'
+require 'rspec'
 require 'rspec/expectations'
 
 class FakeJiraTool
@@ -18,6 +19,6 @@ class FakeJiraTool
 end
 
 RSpec.configure do |config|
-  config.mock_framework = :rspec
+  config.color_enabled = true
 end
 

data/spec/ticket_spec.rb

@@ -1,11 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe TaskMapper::Provider::Jira::Ticket do 
-  before(:each) do
-    @url = "some_url"
-    @fj = FakeJiraTool.new
-    @project_jira = Struct.new(:id, :name, :description).new(1, 'project', 'project description')
-    @ticket = Struct.new(:id, 
+  let(:url) { 'http://jira.atlassian.com' }
+  let(:fake_jira) { FakeJiraTool.new } 
+  let(:project_from_jira) { Struct.new(:id, :name, :description).new(1, 'project', 'project description') }
+  let(:ticket_from_jira) do 
+               Struct.new(:id, 
                          :status, 
                          :priority, 
                          :summary, 
@@ -13,37 +13,51 @@ describe TaskMapper::Provider::Jira::Ticket do
                          :created, 
                          :updated, 
                          :description, :assignee, :reporter).new(1,'open','high', 'ticket 1', 'none', Time.now, Time.now, 'description', 'myself', 'yourself')
-    Jira4R::JiraTool.stub!(:new).with(2, @url).and_return(@fj)
-    @fj.stub!(:getProjectsNoSchemes).and_return([@project_jira, @project_jira])
-    @fj.stub!(:getProjectById).and_return(@project_jira)
-    @fj.stub!(:getIssuesFromJqlSearch).and_return([@ticket])
-    @tm = TaskMapper.new(:jira, :username => 'testuser', :password => 'testuser', :url => @url)
-    @project_tm = @tm.projects.first
-    @klass = TaskMapper::Provider::Jira::Ticket
   end
-
-  it "should be able to load all tickets"  do 
-     @project_tm.tickets.should be_an_instance_of(Array)
-     @project_tm.tickets.first.should be_an_instance_of(@klass)
+  let(:tm) {  TaskMapper.new(:jira, :username => 'testuser', :password => 'testuser', :url => url) }
+  let(:ticket_class) { TaskMapper::Provider::Jira::Ticket }
+  let(:project_from_tm) { tm.project 1 }
+  let(:ticket_id) { 1 }
+    
+  before(:each) do
+    Jira4R::JiraTool.stub!(:new).with(2, url).and_return(fake_jira)
+    fake_jira.stub!(:getProjectsNoSchemes).and_return([project_from_jira, project_from_jira])
+    fake_jira.stub!(:getProjectById).and_return(project_from_jira)
+    fake_jira.stub!(:getIssuesFromJqlSearch).and_return([ticket_from_jira])
   end
 
-  it "should be able to load all tickets based on array of id's" do
-    tickets = @project_tm.tickets([1])
-    tickets.should be_an_instance_of(Array)
-    tickets.first.should be_an_instance_of(@klass)
-    tickets.first.id.should == 1
-  end
+  describe "Retrieving tickets" do 
+    context "when #tickets" do 
+      subject { project_from_tm.tickets } 
+      it { should be_an_instance_of Array }
 
-  it "should be able to load a single ticket based on id" do 
-    ticket = @project_tm.ticket(1)
-    ticket.should be_an_instance_of(@klass)
-    ticket.id.should == 1
-  end
+      context "when #tickets.first" do 
+        subject { project_from_tm.tickets.first } 
+        it { should be_an_instance_of ticket_class }
+      end
+    end
+
+    context "when #tickets with array of id's" do 
+      subject { project_from_tm.tickets [ticket_id] } 
+      it { should be_an_instance_of Array }
+    end
+
+    context "when #tickets with attributes" do 
+      subject { project_from_tm.tickets :id => ticket_id } 
+      it { should be_an_instance_of Array }
+    end
+
+    describe "Retrieve a single ticket" do 
+      context "when #ticket with id" do 
+        subject { project_from_tm.ticket ticket_id } 
+        it { should be_an_instance_of ticket_class }
+      end
 
-  it "should be able to load a single ticket based on attributes" do
-    ticket = @project_tm.ticket(:id => 1)
-    ticket.should be_an_instance_of(@klass)
-    ticket.id.should == 1
+      context "when #ticket with attribute" do 
+        subject { project_from_tm.ticket :id => ticket_id } 
+        it { should be_an_instance_of ticket_class }
+      end
+    end
   end
 
 end

metadata

@@ -1,35 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: taskmapper-jira
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Charles Lowell
 - Rafael George
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-11 00:00:00 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies: []
-
 description: Interact with Atlassian JIRA ticketing system from Ruby
-email: 
+email:
 - cowboyd@thefrontside.net
 - rafael@hybridgroup.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rbenv-gemsets
 - .rvmrc
@@ -44,6 +34,7 @@ files:
 - lib/provider/ticket.rb
 - lib/taskmapper-jira.rb
 - spec/comment_spec.rb
+- spec/fixtures/projects.xml
 - spec/project_spec.rb
 - spec/spec_helper.rb
 - spec/taskmapper-jira_spec.rb
@@ -51,39 +42,34 @@ files:
 - taskmapper-jira.gemspec
 homepage: http://github.com/hybridgroup/taskmapper-jira
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 320469779
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: taskmapper binding for JIRA
-test_files: 
+test_files:
 - spec/comment_spec.rb
+- spec/fixtures/projects.xml
 - spec/project_spec.rb
 - spec/spec_helper.rb
 - spec/taskmapper-jira_spec.rb