jirarest2 0.0.6 → 0.0.7

data/test/test_result.rb

@@ -1,7 +1,8 @@
 require "minitest/autorun"
-require "connect"
-require "credentials"
+require "jirarest2/connect"
+require "jirarest2/credentials"
 require "jirarest2/result"
+require "webmock/minitest"
 
 class TestResult < MiniTest::Unit::TestCase
   def setup
@@ -10,19 +11,32 @@ class TestResult < MiniTest::Unit::TestCase
   end
 
   def test_code
-    assert "200", @con.execute("Get","issue/createmeta/","").code
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issue/createmeta/").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => "", :headers => {})
+    assert_equal "200", @con.execute("Get","issue/createmeta/","").code
   end
 
+  def test_code_400
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issue/createmeta/").with(:headers => {'Content-Type'=>'application/json;charset=UTF-8'}).to_return(:status => 400, :body => "", :headers => {})
+    assert_equal "400", @con.execute("Get","issue/createmeta/","").code
+  end
+
+
   def test_header
-    assert "test", @con.execute("Get","issue/createmeta/","").header["x-ausername"]
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issue/createmeta/").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => "", :headers => {"X-AUSERNAME" => "test"})
+    assert_equal ["test"], @con.execute("Get","issue/createmeta/","").header["x-ausername"]
   end
   
+  
   def test_result
-    assert "projects", @con.execute("Get","issue/createmeta/","").result["expand"]
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issue/createmeta/").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"expand":"projects","projects":[{"self":"http://localhost:2990/jira/rest/api/2/project/MFTP","id":"10000","key":"MFTP","name":"My first Test Project","avatarUrls":{"16x16":"http://localhost:2990/jira/secure/projectavatar?size=small&pid=10000&avatarId=10011","48x48":"http://localhost:2990/jira/secure/projectavatar?pid=10000&avatarId=10011"},"issuetypes":[{"self":"http://localhost:2990/jira/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://localhost:2990/jira/images/icons/bug.gif","name":"Bug","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/3","id":"3","description":"A task that needs to be done.","iconUrl":"http://localhost:2990/jira/images/icons/task.gif","name":"Task","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/6","id":"6","description":"An own issue type","iconUrl":"http://localhost:2990/jira/images/icons/ico_epic.png","name":"My issue type","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/5","id":"5","description":"The sub-task of the issue","iconUrl":"http://localhost:2990/jira/images/icons/issue_subtask.gif","name":"Sub-task","subtask":true},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/4","id":"4","description":"An improvement or enhancement to an existing feature or task.","iconUrl":"http://localhost:2990/jira/images/icons/improvement.gif","name":"Improvement","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/2","id":"2","description":"A new feature of the product, which has yet to be developed.","iconUrl":"http://localhost:2990/jira/images/icons/newfeature.gif","name":"New Feature","subtask":false}]},{"self":"http://localhost:2990/jira/rest/api/2/project/SP","id":"10100","key":"SP","name":"Second Project","avatarUrls":{"16x16":"http://localhost:2990/jira/secure/projectavatar?size=small&pid=10100&avatarId=10011","48x48":"http://localhost:2990/jira/secure/projectavatar?pid=10100&avatarId=10011"},"issuetypes":[{"self":"http://localhost:2990/jira/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://localhost:2990/jira/images/icons/bug.gif","name":"Bug","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/2","id":"2","description":"A new feature of the product, which has yet to be developed.","iconUrl":"http://localhost:2990/jira/images/icons/newfeature.gif","name":"New Feature","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/3","id":"3","description":"A task that needs to be done.","iconUrl":"http://localhost:2990/jira/images/icons/task.gif","name":"Task","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/4","id":"4","description":"An improvement or enhancement to an existing feature or task.","iconUrl":"http://localhost:2990/jira/images/icons/improvement.gif","name":"Improvement","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/5","id":"5","description":"The sub-task of the issue","iconUrl":"http://localhost:2990/jira/images/icons/issue_subtask.gif","name":"Sub-task","subtask":true},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/6","id":"6","description":"An own issue type","iconUrl":"http://localhost:2990/jira/images/icons/ico_epic.png","name":"My issue type","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/7","id":"7","description":"","iconUrl":"http://localhost:2990/jira/images/icons/genericissue.gif","name":"Trys","subtask":false}]}]}', :headers => {})
+    
+    assert_equal "projects", @con.execute("Get","issue/createmeta/","").result["expand"]
   end
   
   
   def test_body
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issue/createmeta/").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"expand":"projects","projects":[{"self":"http://localhost:2990/jira/rest/api/2/project/MFTP","id":"10000","key":"MFTP","name":"My first Test Project","avatarUrls":{"16x16":"http://localhost:2990/jira/secure/projectavatar?size=small&pid=10000&avatarId=10011","48x48":"http://localhost:2990/jira/secure/projectavatar?pid=10000&avatarId=10011"},"issuetypes":[{"self":"http://localhost:2990/jira/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://localhost:2990/jira/images/icons/bug.gif","name":"Bug","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/3","id":"3","description":"A task that needs to be done.","iconUrl":"http://localhost:2990/jira/images/icons/task.gif","name":"Task","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/6","id":"6","description":"An own issue type","iconUrl":"http://localhost:2990/jira/images/icons/ico_epic.png","name":"My issue type","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/5","id":"5","description":"The sub-task of the issue","iconUrl":"http://localhost:2990/jira/images/icons/issue_subtask.gif","name":"Sub-task","subtask":true},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/4","id":"4","description":"An improvement or enhancement to an existing feature or task.","iconUrl":"http://localhost:2990/jira/images/icons/improvement.gif","name":"Improvement","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/2","id":"2","description":"A new feature of the product, which has yet to be developed.","iconUrl":"http://localhost:2990/jira/images/icons/newfeature.gif","name":"New Feature","subtask":false}]},{"self":"http://localhost:2990/jira/rest/api/2/project/SP","id":"10100","key":"SP","name":"Second Project","avatarUrls":{"16x16":"http://localhost:2990/jira/secure/projectavatar?size=small&pid=10100&avatarId=10011","48x48":"http://localhost:2990/jira/secure/projectavatar?pid=10100&avatarId=10011"},"issuetypes":[{"self":"http://localhost:2990/jira/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://localhost:2990/jira/images/icons/bug.gif","name":"Bug","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/2","id":"2","description":"A new feature of the product, which has yet to be developed.","iconUrl":"http://localhost:2990/jira/images/icons/newfeature.gif","name":"New Feature","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/3","id":"3","description":"A task that needs to be done.","iconUrl":"http://localhost:2990/jira/images/icons/task.gif","name":"Task","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/4","id":"4","description":"An improvement or enhancement to an existing feature or task.","iconUrl":"http://localhost:2990/jira/images/icons/improvement.gif","name":"Improvement","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/5","id":"5","description":"The sub-task of the issue","iconUrl":"http://localhost:2990/jira/images/icons/issue_subtask.gif","name":"Sub-task","subtask":true},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/6","id":"6","description":"An own issue type","iconUrl":"http://localhost:2990/jira/images/icons/ico_epic.png","name":"My issue type","subtask":false},{"self":"http://localhost:2990/jira/rest/api/2/issuetype/7","id":"7","description":"","iconUrl":"http://localhost:2990/jira/images/icons/genericissue.gif","name":"Trys","subtask":false}]}]}', :headers => {})
+
     assert_match "http://localhost:2990/jira/rest/api/2/project", @con.execute("Get","issue/createmeta/","").body
   end
   

data/test/test_watcher.rb

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 require "minitest/autorun"
-require "credentials"
-require "connect"
-require "services/watcher"
+require "jirarest2/credentials"
+require "jirarest2/connect"
+require "jirarest2/services/watcher"
+require "webmock/minitest"
 
 class TestWatcher < MiniTest::Unit::TestCase
   def setup
@@ -10,24 +11,37 @@ class TestWatcher < MiniTest::Unit::TestCase
     @con = Connect.new(cred)
   end
   
-  def test_get_watchers
+  def test_get_watchers_filled
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issue/MFTP-7/watchers").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"self":"http://localhost:2990/jira/rest/api/2/issue/MFTP-7/watchers","isWatching":true,"watchCount":3,"watchers":[{"self":"http://localhost:2990/jira/rest/api/2/user?username=admin","name":"admin","avatarUrls":{"16x16":"http://localhost:2990/jira/secure/useravatar?size=small&avatarId=10122","48x48":"http://localhost:2990/jira/secure/useravatar?avatarId=10122"},"displayName":"admin","active":true},{"self":"http://localhost:2990/jira/rest/api/2/user?username=cebit","name":"cebit","avatarUrls":{"16x16":"http://localhost:2990/jira/secure/useravatar?size=small&avatarId=10122","48x48":"http://localhost:2990/jira/secure/useravatar?avatarId=10122"},"displayName":"Cyril Bitterich","active":true},{"self":"http://localhost:2990/jira/rest/api/2/user?username=test","name":"test","avatarUrls":{"16x16":"http://localhost:2990/jira/secure/useravatar?size=small&avatarId=10122","48x48":"http://localhost:2990/jira/secure/useravatar?avatarId=10122"},"displayName":"Test User","active":true}]}', :headers => {})
     watchers = Watcher.new(@con,"MFTP-7")
-    assert ["admin","cebit","test"], watchers.get_watchers
-    assert [], Watcher.new(@con,"MFTP-3")
+    assert_equal ["admin","cebit","test"], watchers.get_watchers
+  end
+  
+  def test_get_watchers_empty
+    stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issue/MFTP-3/watchers").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"self":"http://localhost:2990/jira/rest/api/2/issue/MFTP-3/watchers","isWatching":false,"watchCount":0,"watchers":[]}', :headers => {})
+    watchers = Watcher.new(@con,"MFTP-3")
+    assert_equal [], watchers.get_watchers
   end
   
   def test_delete_watcher
+    stub_request(:delete, "http://test:1234@localhost:2990/jira/rest/api/2/issue/MFTP-7/watchers?username=cebit").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 401, :body => '{"errorMessages":["User \'test\' is not allowed to remove watchers from issue \'MFTP-7\'"],"errors":{}}', :headers => {})
+
     watchers = Watcher.new(@con,"MFTP-7")
     assert_raises(Jirarest2::AuthentificationError) { 
       watchers.remove_watcher("cebit")
     }
   end
 
-  def test_add_watcher
+  def test_add_watcher_fail
+    stub_request(:post, "http://test:1234@localhost:2990/jira/rest/api/2/issue/MFTP-2/watchers").with(:body => "\"cebit\"", :headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 401, :body => '{"errorMessages":["User \'test\' is not allowed to add watchers to issue \'MFTP-2\'"],"errors":{}}', :headers => {})
+
     watcherna = Watcher.new(@con, "MFTP-2")
     assert_raises(Jirarest2::AuthentificationError) {
       watcherna.add_watcher("cebit")
     }
+  end
+  def test_add_watcher_success
+    stub_request(:post, "http://test:1234@localhost:2990/jira/rest/api/2/issue/SP-1/watchers").with(:body => "\"cebit\"",:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 204, :headers => {})
     watchers = Watcher.new(@con, "SP-1")
     assert true, watchers.add_watcher("cebit")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jirarest2
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -100,6 +100,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +144,7 @@ email:
 - cebit-jirarest@gunnet.de
 executables:
 - create_issue.rb
+- jira_create_issue
 - jira_create_issue.rb
 extensions: []
 extra_rdoc_files:
@@ -142,19 +159,21 @@ files:
 - README.txt
 - Rakefile
 - bin/create_issue.rb
+- bin/jira_create_issue
 - bin/jira_create_issue.rb
 - copyright
-- lib/connect.rb
-- lib/credentials.rb
-- lib/exceptions.rb
-- lib/issue.rb
 - lib/jirarest2.rb
+- lib/jirarest2/connect.rb
+- lib/jirarest2/credentials.rb
+- lib/jirarest2/exceptions.rb
+- lib/jirarest2/issue.rb
+- lib/jirarest2/madbitconfig.rb
 - lib/jirarest2/result.rb
-- lib/madbitconfig.rb
-- lib/services.rb
-- lib/services/issuelink.rb
-- lib/services/issuelinktype.rb
-- lib/services/watcher.rb
+- lib/jirarest2/services.rb
+- lib/jirarest2/services/issuelink.rb
+- lib/jirarest2/services/issuelinktype.rb
+- lib/jirarest2/services/watcher.rb
+- test/data/issuespec.txt
 - test/data/test.config.data
 - test/data/test.json
 - test/data/test.nojson

data/lib/services/issuelinktype.rb

@@ -1,91 +0,0 @@
-# 
-#    Copyright (C) 2012 Cyril Bitterich
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-require "services"
-
-#  An IssueLinkType Object represents one or all IssueLinkTypes
-class IssueLinkType < Services
-
-
-  # @param [Connection] connection
-  # @param [String] data issueLinkType ID 
-  # @return [Jirarest2::Result]
-  def initialize(connection,data = "")
-    if data == "" then
-      @uritail = "issueLinkType"
-    else
-      @uritail = "issueLinkType/#{data}"
-    end
-    super(connection)
-    @all = get
-  end
-
-private
-
-  # do the search for each block
-  # @param [Hash] hash One LinkIssueType in a hash representation
-  # @param [String] uiname the way the linktype is shown in the browser
-  # @return [Array] Actual name oft the LinkIssueType
-  def name_block_search(hash,uiname)
-    name = nil
-    direction = nil
-    if ( hash["inward"] == uiname) then
-      direction = "inward"
-      name = hash["name"]
-      return name, direction
-    elsif (hash["outward"] == uiname) then
-      direction = "outward"
-      name = hash["name"]
-      return name, direction
-    else 
-      return nil # Save my butt
-    end
-  end
-
-
-public
-
-  #Get the internal name and direction instead of the one in the UI.
-  # @param [String] uiname the way the linktype is shown in the browser
-  # @return [Array, nil] Array with the name and the direction ("inward" or "outward") if successfull , nil if not
-  def name(uiname)
-    if @all["issueLinkTypes"].instance_of?(Array) then
-      @all["issueLinkTypes"].each{ |hash|
-        result =  name_block_search(hash,uiname)
-        return result if result # Return if we got an actual result
-      }
-    else
-      return name_block_search(@all,uiname)
-    end
-    return nil # Nothing found don't want to return @all
-  end # name
-
-  # Is the name realy the internal name we need to use?
-  # @param [String] test String to test agains the names of IssueLinkTypes
-  # @return [Boolean] 
-  def internal_name?(test)
-    if @all["issueLinkTypes"].instance_of?(Array) then
-      @all["issueLinkTypes"].each{ |hash|
-        return true if ( hash["name"] == test)
-      }
-    else
-      return ( @all["name"] == test )
-    end
-    return false # Nothing found don't want to return @all
-  end
-
-end #class