jirarest2 0.0.10 → 0.0.11

data/History.txt

@@ -1,3 +1,25 @@
+=== 0.0.11 / 2012-08-05
+
+* 1 major enhancements:
+
+  * Added support to authenticate with cookies (default with the scripts)
+
+* 2 minor enhancements:
+
+  * Refactored Connect
+  * Refactored Credentials
+
+* 1 bug fixes:
+
+  * fixed #7 It's now possible to use the scripts in (unix) pipes as well
+
+* 3 unknowns:
+
+  * Added deb.rb to find debug information at compile stage (reacts to environment variable "DEBUG")
+  * Deleted deprecated files
+  * corrected spelling errors
+
+
 === 0.0.10 / 2012-08-02
 
 * 1 major enhancement:

data/Manifest.txt

@@ -4,18 +4,19 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-bin/create_issue.rb
 bin/jira_comment
 bin/jira_create_issue
-bin/jira_create_issue.rb
 bin/jira_watcher
 copyright
+lib/deb.rb
 lib/jirarest2.rb
 lib/jirarest2/connect.rb
+lib/jirarest2/cookie_credentials.rb
 lib/jirarest2/credentials.rb
 lib/jirarest2/exceptions.rb
 lib/jirarest2/issue.rb
 lib/jirarest2/madbitconfig.rb
+lib/jirarest2/password_credentials.rb
 lib/jirarest2/result.rb
 lib/jirarest2/services.rb
 lib/jirarest2/services/comment.rb
@@ -23,6 +24,7 @@ lib/jirarest2/services/issuelink.rb
 lib/jirarest2/services/issuelinktype.rb
 lib/jirarest2/services/watcher.rb
 lib/jirarest2bin.rb
+test/data/cookiejar
 test/data/get-comments.txt
 test/data/issuespec.txt
 test/data/test.config.data
@@ -32,10 +34,12 @@ test/data/test.nojson1
 test/data/ticket.json
 test/test_comment.rb
 test/test_connect.rb
+test/test_cookie_credentials.rb
 test/test_credentials.rb
 test/test_issue.rb
 test/test_issuelink.rb
 test/test_issuelinktype.rb
 test/test_madbitconfig.rb
+test/test_password_credentials.rb
 test/test_result.rb
 test/test_watcher.rb

data/README.txt

@@ -8,7 +8,7 @@ jirarest2 is yet another implementation of the JIRA(tm) REST-API[https://develop
 
 It is intended to be called within the shell to create and verify JIRA(tm) issues fast without a browser. There was no particular need for perfomance at the time of writing.
 
-This implementation is still a for cry from others like http://rubygems.org/gems/jira-ruby which requires oauth authentification. 
+This implementation is still a for cry from others like http://rubygems.org/gems/jira-ruby which requires oauth authentication. 
 
 There are scripts to create new issues with watchers and link those to existing issues and to manipulate watchers on existing issues.
 
@@ -23,6 +23,7 @@ There are scripts to create new issues with watchers and link those to existing
    * jira_create_issue allows you to create new issues with watchers and link those to existing issues
    * jira_watcher allows you to manipulate watchers on existing issues
    * jira_comment allows you to add read and update comments. (The latter only if you know the right comment id)
+   * Uses cookie_auth by default. First login will be done via basic auth though.
 
 == SYNOPSIS:
 

data/bin/jira_comment

@@ -17,7 +17,7 @@
 
 
 require "jirarest2bin"
-require "pp"
+require "deb"
 
 # Check for the minimum ruby version we need
 Jirarest2Bin::check_ruby_version
@@ -98,7 +98,7 @@ end
 # @param [Array] issues An Array containing the issuekeys
 # @param [Fixnum] id Identidication number of the comment to view
 def view_comments(issues,id = nil)
-  connection = Jirarest2Bin::get_connection(@scriptopts,@connection)
+  connection = Jirarest2Bin::command(@scriptopts,@connection,:connection)
   result = Array.new
   if id.nil? then
     issues.each { |issue|
@@ -119,7 +119,7 @@ end
 # @param [String] method Kind of work to be done
 # @param [Fixnum] id Identifier of the comment
 def work(issues,text,method,id = nil)
-  connection = Jirarest2Bin::get_connection(@scriptopts,@connection)
+  connection = Jirarest2Bin::command(@scriptopts,@connection,:connection)
   issues.each{ |issue|
     connectedissue = Comment.new(connection, issue, id)
     connectedissue.send method, text

data/bin/jira_create_issue

@@ -18,7 +18,7 @@
 #
 
 require "jirarest2bin"
-require "pp"
+require "deb"
 
 # Check for the minimum ruby version we need
 Jirarest2Bin::check_ruby_version
@@ -146,14 +146,7 @@ def open_issue
     if @issueopts.issue.nil? then
       Jirarest2Bin::required_argument("issue")
     end
-    issue=Issue.new(@issueopts.project,@issueopts.issue,Jirarest2Bin::get_connection(@scriptopts,@connection))
-  rescue Jirarest2::AuthentificationError => e
-    puts "Password not accepted."
-    @scriptopts.pass = Jirarest2Bin.get_password(@scriptopts.username)
-    retry
-  rescue Jirarest2::AuthentificationCaptchaError => e
-    puts "Wrong Password too many times.\nCaptcha time at #{e.to_s} to reenable your account."
-    exit 1
+    @connection,issue =  Jirarest2Bin::command(@scriptopts,@connection,:issue,@issueopts.project,@issueopts.issue)
   rescue Jirarest2::WrongProjectException => e
     no_issue("project",e)
   rescue Jirarest2::WrongIssuetypeException => e
@@ -255,7 +248,9 @@ end
 =end
 def create_new_ticket(issue)
   begin
-    connection = Jirarest2Bin::get_connection(@scriptopts,@connection) # We need it so often in the next few lines that I prefer to get the result in a variable
+#    connection = Jirarest2Bin::get_connection(@scriptopts,@connection) # We need it so often in the next few lines that I prefer to get the result in a variable
+    connection = Jirarest2Bin::command(@scriptopts,@connection,:connection)
+    
     result = issue.persist(connection).result
     # Set the watchers
     if @issueopts.watchers then

data/bin/jira_watcher

@@ -17,7 +17,7 @@
 
 
 require "jirarest2bin"
-require "pp"
+require "deb"
 
 # Check for the minimum ruby version we need
 Jirarest2Bin::check_ruby_version
@@ -67,7 +67,7 @@ end # class
 # It will then print those issues and their watchers to STDOUT 
 # @param [Array] issues An Array containing the issuekeys
 def view_watchers(issues)
-  connection = Jirarest2Bin::get_connection(@scriptopts,@connection)
+  connection =  Jirarest2Bin::command(@scriptopts,@connection,:connection)
   issues.each { |issue|
     connectedissue = Watcher.new(connection, issue)
     watchers =  connectedissue.get_watchers
@@ -87,7 +87,7 @@ end
 # @param [Array] users Users to work with
 # @param [Array] toto Kind of work to be done
 def work_watchers(issues,users,todo)
-  connection = Jirarest2Bin::get_connection(@scriptopts,@connection)
+  connection =  Jirarest2Bin::command(@scriptopts,@connection,:connection)
   issues.each{ |issue|
     connectedissue = Watcher.new(connection, issue)
     method = todo + "_watcher" # the name of the method we want to call with send

data/{bin/create_issue.rb → lib/deb.rb}

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
+# This files only purpose is to have one place to control all debugging information
 
-# Script to create a new issue with jira.
 #    Copyright (C) 2012 Cyril Bitterich
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -17,7 +16,12 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-puts "File has been renamed to jira_create_issue"
-newfile = File.dirname($0) + "/jira_create_issue"
-puts "Please use: #{newfile} #{$*.join(" ")}"
 
+if ENV['DEBUG'] then
+  require "pp"
+  # Version of pp that will result in errors if the environment Variable "DEBUG" is not set.
+  # A way to find forgotten debug info before shipping?
+  def ppp(data)
+    pp data
+  end
+end

data/lib/jirarest2.rb

@@ -1,4 +1,4 @@
-# Jirarest2 is a gem to connect to the REST interface of JIRA(tm) . It uses Basic authentification and not oauth
+# Jirarest2 is a gem to connect to the REST interface of JIRA(tm) . It uses Basic authentication and not oauth
 
 
 #    Copyright (C) 2012 Cyril Bitterich
@@ -17,11 +17,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-VERSION = "0.0.10"
+VERSION = "0.0.11"
 
 require_relative "jirarest2/connect"
 require_relative "jirarest2/issue"
 require_relative "jirarest2/credentials"
+require_relative "jirarest2/password_credentials"
+require_relative "jirarest2/cookie_credentials"
 require_relative "jirarest2/exceptions"
 require_relative "jirarest2/services/watcher"
 require_relative "jirarest2/services"

data/lib/jirarest2/connect.rb

@@ -19,31 +19,31 @@
 require 'net/http'
 require 'jirarest2/exceptions'
 require 'jirarest2/result'
-require "pp"
+require "deb"
 
 
 
 # A Connect object encasulates the connection to jira via REST. It takes an Credentials object and returns a Jirarest2::Result object or an exception if something went wrong.
 class Connect
-  
-# Create an instance of Connect.
-# @param [Credentials] credentials
+  # Get the credentials
+  attr_reader :credentials
+
+  # Create an instance of Connect.
+  # @param [Credentials] credentials
   def initialize(credentials)
-    @pass = credentials.password
-    @user = credentials.username
-    @CONNECTURL = credentials.connecturl
+    @credentials = credentials
   end
 
   
 
-# Execute the request
-# @param [String, "Get", "Post", "Delete", "Put"] operation HTTP method:  GET, POST, DELETE, PUT
-# @param [String] uritail The last part of the REST URI
-# @param [Hash] data Data to be sent.
-# @return [Jirarest2::Result]
+  # Execute the request
+  # @param [String, "Get", "Post", "Delete", "Put"] operation HTTP method:  GET, POST, DELETE, PUT
+  # @param [String] uritail The last part of the REST URI
+  # @param [Hash] data Data to be sent.
+  # @return [Jirarest2::Result]
   def execute(operation,uritail,data)
     uri = nil
-    uri = URI(@CONNECTURL+uritail)
+    uri = URI(@credentials.connecturl+uritail)
     if data != "" then
       if ! (operation == "Post" || operation == "Put") then # POST carries the payload in the body that's why we have to wait
         uri.query = URI.encode_www_form(data)
@@ -51,8 +51,10 @@ class Connect
     end
     
     req = nil
-    req = Net::HTTP::const_get(operation).new(uri.request_uri) # "Classes Are Just Obejects, Too" (Design Patterns in Ruby, Russ Olsen, Addison Wessley)
-    req.basic_auth @user, @pass
+    req = Net::HTTP::const_get(operation).new(uri.request_uri) 
+    # Authentication Header is built up in a credential class
+    @credentials.get_auth_header(req)
+
     req["Content-Type"] = "application/json;charset=UTF-8"
 
     if data != "" then
@@ -67,16 +69,21 @@ class Connect
     result = Net::HTTP.start(uri.host, uri.port) {|http|
       http.request(req)
     }
-
     # deal with output
     case result
     when Net::HTTPBadRequest # 400
       raise Jirarest2::BadRequestError, result.body
     when Net::HTTPUnauthorized # 401 No login-credentials oder wrong ones.
-      raise Jirarest2::AuthentificationError, result.body
+      if @credentials.instance_of?(PasswordCredentials) then
+        raise Jirarest2::PasswordAuthenticationError, result.body
+      elsif @credentials.instance_of?(CookieCredentials) then
+        raise Jirarest2::CookieAuthenticationError, result.body
+      else
+        raise Jirarest2::AuthenticationError, result.body
+      end
     when Net::HTTPForbidden # 403
       if result.get_fields("x-authentication-denied-reason")[0] =~ /.*login-url=(.*)/ then #Captcha-Time
-        raise Jirarest2::AuthentificationCaptchaError, $1
+        raise Jirarest2::AuthenticationCaptchaError, $1
       else
         raise Jirarest2::ForbiddenError, result.body
       end
@@ -84,30 +91,29 @@ class Connect
       raise Jirarest2::NotFoundError, result.body
 
     end
-    
-    return Jirarest2::Result.new(result)
+    ret = Jirarest2::Result.new(result)
+    @credentials.bake_cookies(ret.header["set.cookie"]) if @credentials.instance_of?(CookieCredentials)  # Make sure cookies are always up to date if we use them.
+    return ret
   end # execute
 
 
-# Is the rest API really at the destination we think it is?
-# @return [Boolean] 
+  # Is the rest API really at the destination we think it is?
+  # @return [Boolean] 
   def check_uri
-    begin 
-      begin
-        ret = (execute("Get","dashboard","").code == "200")
-# TODO is the 404 really possible?
-      rescue Jirarest2::NotFoundError 
-        return false
-      rescue Jirarest2::BadRequestError
-        return false
-      end
+    begin
+      ret = (execute("Get","dashboard","").code == "200")
+      # TODO is the 404 really possible?
+    rescue Jirarest2::NotFoundError 
+      return false
+    rescue Jirarest2::BadRequestError
+      return false
     end
   end
 
-# Try to be nice. Parse the URI and see if you can find a pattern to the problem
-# @param [String] url
-# @return [String] a fixed URL
-  def heal_uri(url = @CONNECTURL)
+  # Try to be nice. Parse the URI and see if you can find a pattern to the problem
+  # @param [String] url
+  # @return [String] a fixed URL
+  def heal_uri(url = @credentials.connecturl)
     splitURI = URI.split(url) # [Scheme,Userinfo,Host,Port,Registry,Path,Opaque,Query,Fragment]
     splitURI[5].gsub!(/^(.*)2$/,'\12/')
     splitURI[5].gsub!(/\/+/,'/') # get rid of duplicate /
@@ -123,16 +129,16 @@ class Connect
   end
 
 
-# try to fix the connecturl of this instance 
-# @return [String,Jirarest2::CouldNotHealURIError] Fixed URL or Exception
+  # try to fix the connecturl of this instance 
+  # @return [String,Jirarest2::CouldNotHealURIError] Fixed URL or Exception
  def heal_uri!
    if ! check_uri then
-     @CONNECTURL = heal_uri(@CONNECTURL)
+     @credentials.connecturl = heal_uri(@credentials.connecturl)
    end
    if check_uri then
-     return @CONNECTURL
+     return @credentials.connecturl
    else
-     raise Jirarest2::CouldNotHealURIError, @CONNECTURL
+     raise Jirarest2::CouldNotHealURIError, @credentials.connecturl
    end
  end
 

data/lib/jirarest2/cookie_credentials.rb

@@ -0,0 +1,126 @@
+#    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_relative "credentials"
+require_relative "password_credentials"
+require_relative "result"
+require_relative "connect"
+require "pstore"
+
+# Cookies as credential for the server
+# login uses basic auth to log in and then cookies are used
+class CookieCredentials < Credentials
+
+  # Location of the file the cookie is persited on a harddrive. Default is "~/.jirarest2.cookie
+  attr_accessor :cookiestore
+
+  # @param [String] url URL to JIRA(tm) instance
+  # @param [Boolean] autosave Save the cookie on the harddisk whenever something happens?
+  def initialize(connecturl, autosave = false )
+    super(connecturl)
+    @cookiejar = {}
+    @autosave = autosave
+    @cookiestore = "~/.jirarest2.cookie"
+  end
+
+  # Setup new cookies or update the existing jar.
+  # @param [Array] header Header after a request
+  def bake_cookies(header)
+    return if !header
+    header.each do |cookie|
+      next unless (pair = cookie.gsub(/[;]*\s*Path=\S+[,]*/,'').split(/\=/)).length == 2
+      @cookiejar[pair.first] = pair.last
+    end
+    store_cookiejar if @autosave    
+    return @cookiejar
+  end
+  
+  # Name alias for bake_cookies
+  # @param [String] header Header after a request
+  def set_cookies(header)
+    return bake_cookies(header)
+  end
+
+  # Get the cookies in the format to send as header
+  def get_cookies
+    @cookiejar.map { |cookie| cookie * '=' }.join('; ')
+  end
+
+  # Get the auth header to send to the server
+  # @param [Net:::HTTP::Post,Net:::HTTP::Put,Net:::HTTP::Get,Net:::HTTP::Delete] request Request object
+  # @raise [Jirarest2::AuthenticationError] if there is no JSESSIONID cookie entry 
+  # @return [String] Header-Line
+  def get_auth_header(request)
+    if @cookiejar["JSESSIONID"].nil? then
+      raise Jirarest2::CookieAuthenticationError, "No valid cookies"
+    end
+    if get_cookies == "" then
+      # This code should never be executed as the AuthenticationError above will catch more cases
+      request["Cookie"] = "JSESSIONID=0" 
+    else
+      request["Cookie"] = get_cookies 
+    end
+  end
+
+  # Login per username and password in case the cookie is invalid or missing
+  # Uses basic auth to authenticate
+  # @param [String] username Username to use for login
+  # @param [String] password Password to use for login
+  def login(username,password)
+    pconnecturl = @connecturl.gsub(/\/*rest\/api\/.+/,"/rest/") # Unfortunately the session information is not in the same tree as all the other rest calls
+    pcred = PasswordCredentials.new(pconnecturl,username,password)
+    pconnect = Connect.new(pcred)
+    result = pconnect.execute("Post","auth/latest/session",{"username" => username, "password" => password})
+    bake_cookies(result.header["set-cookie"]) # I already had them seperated into an Array.
+    return @cookiejar["JSESSIONID"]
+  end
+  
+  # Invalidates the current cookie
+  # @return [Boolean] true if successful
+  def logout
+    originalConnectUrl = @connecturl
+    begin
+      @connecturl = @connecturl.gsub(/rest\/api\/.+/,"rest/") # Unfortunately the session information is not in the same tree as all the other rest calls
+      con = Connect.new(self)
+      ret = con.execute("Delete","auth/latest/session","").code
+      store_cookiejar if @autosave
+      return true if ret == "204"
+    rescue
+      raise
+    ensure
+      @connecturl = originalConnectUrl
+    end
+  end
+  
+  # Loads a cookiejar from disk
+  def load_cookiejar
+    storage = PStore.new(File.expand_path(@cookiestore))
+    storage.transaction do
+      @cookiejar = storage["cookiejar"]
+    end
+    @cookiejar = {} if @cookiejar.nil? # Fix a not so nice feature of PStore if it doesn't find content in the file
+  end
+  
+  # Writes the cookiejar to disk
+  def store_cookiejar
+    storage = PStore.new(File.expand_path(@cookiestore))
+    storage.transaction do
+      storage["cookiejar"] = @cookiejar 
+    end
+  end
+
+
+end

data/lib/jirarest2/credentials.rb

@@ -21,20 +21,12 @@ require "uri"
 # A Credentials object contains the data required to connect to a JIRA(tm) instance.
 class Credentials
 
-  # username to use
-  attr_accessor :username
-  # password for the connection
-  attr_accessor :password
   # url to connect to the JIRA(tm) instance
   attr_reader :connecturl
 
 
   # @param [String] url URL to JIRA(tm) instance
-  # @param [String] username
-  # @param [String] password
-  def initialize(url,username,password)
-    @username = username
-    @password = password
+  def initialize(url)
     uri = URI(url)
     if uri.instance_of?(URI::HTTP) || uri.instance_of?(URI::HTTPS) then
       @connecturl = url
@@ -54,4 +46,10 @@ class Credentials
     end
   end
 
+  # Get the auth header to send to the server
+  # @param [Net:::HTTP::Post,Net:::HTTP::Put,Net:::HTTP::Get,Net:::HTTP::Delete] request Request object
+  def get_auth_header(request)
+
+  end
+
 end

data/lib/jirarest2/exceptions.rb

@@ -21,11 +21,15 @@ module Jirarest2
 
   # 400 - 
   class BadRequestError < StandardError ; end
-  # 401 Authentification failed 
-  class AuthentificationError < StandardError ; end
-  # 403 Authentification failed and JIRA(tm) requires a login with captcha to continue
-  class AuthentificationCaptchaError < StandardError ; end
-  # 403 Authentification failed
+  # 401 Authentication failed 
+  class AuthenticationError < StandardError ; end
+  # 401 Authentication failed with password authentication
+  class PasswordAuthenticationError < AuthenticationError ; end
+  # 401 Authentication failed with cookie authentication
+  class CookieAuthenticationError < AuthenticationError ; end
+  # 403 Authentication failed and JIRA(tm) requires a login with captcha to continue
+  class AuthenticationCaptchaError < StandardError ; end
+  # 403 Forbidden
   class ForbiddenError < StandardError ; end
   # 404 - Results in HTML body - not JSON
   class NotFoundError < StandardError ; end

data/lib/jirarest2/issue.rb

@@ -233,7 +233,7 @@ class Issue
   # Set the watchers for this Ticket
   # @param [Connection] connection
   # @param [Array] watchers Watchers to be added
-  # @return [Boolean] True if successfull for all
+  # @return [Boolean] True if successful for all
   def add_watchers(connection,watchers)
     success = false # Return whether we were successful with the watchers
     watch = Watcher.new(connection,@issuekey)

data/lib/jirarest2/madbitconfig.rb

@@ -76,6 +76,7 @@ require "json"
     end # JSON or not?
     
     return vars
+    STDIN.reopen if config_file == "-" #TODO See if this really does what it is supposed to do
   end # read.configfile
   
   

data/lib/jirarest2/password_credentials.rb

@@ -0,0 +1,63 @@
+# A Credentials object contains the data required to connect to a JIRA(tm) instance.
+
+#    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_relative "credentials"
+
+# A Credentials object contains the data required to connect to a JIRA(tm) instance.
+class PasswordCredentials < Credentials
+
+  # username to use
+  attr_accessor :username
+  # password for the connection
+  attr_accessor :password
+
+  # @param [String] url URL to JIRA(tm) instance
+  # @param [String] username
+  # @param [String] password
+  def initialize(url,username,password)
+    super(url)
+    @username = username
+    @password = password
+=begin
+    uri = URI(url)
+    if uri.instance_of?(URI::HTTP) || uri.instance_of?(URI::HTTPS) then
+      @connecturl = url
+    else
+      raise Jirarest2::NotAnURLError
+    end
+=end
+  end
+=begin
+  # Throws an Jirarest2::NotAnURLError if the given String is not an URI.
+  # @param [String] url
+  def connecturl=(url)
+    uri = URI(url)
+    if uri.instance_of?(URI::HTTP) || uri.instance_of?(URI::HTTPS) then
+      @connecturl = url
+    else
+      raise Jirarest2::NotAnURLError
+    end
+  end
+=end
+  # Get the auth header to send to the server
+  # @param [Net:::HTTP::Post,Net:::HTTP::Put,Net:::HTTP::Get,Net:::HTTP::Delete] request Request object
+  def get_auth_header(request)
+    request.basic_auth  @username, @password
+  end
+
+end

data/lib/jirarest2/services/issuelinktype.rb

@@ -72,7 +72,7 @@ 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
+  # @return [Array, nil] Array with the name and the direction ("inward" or "outward") if successful , nil if not
   def name(uiname)
     return uiname if @types.has_key?(uiname)  # If the name is already correct just bounce it back
     @types.each { |name,singletype|

data/lib/jirarest2bin.rb

@@ -49,6 +49,11 @@ module Jirarest2Bin
       text["username"] = "#{scriptopts.username}"
     end
     text["#password"] = "Your!PassW0rd"
+    if scriptopts.nocookieauth.nil? || scriptopts.nocookieauth then
+      text["nocookieauth"] = "false"
+    else
+      text["nocookieauth"] = "true"
+    end
     begin
       if scriptopts.writeconf == :forcewrite then
         MadbitConfig::write_configfile(scriptopts.configfile,text,:force)
@@ -75,6 +80,7 @@ module Jirarest2Bin
   # @param [String] username The Username to show
   # @return [String] the password as read from the command line
   def self.get_password(username)
+    STDIN.reopen '/dev/tty'
     password = ask("Enter your password for user \"#{username}\":  ") { |q| 
       q.echo = "*" 
     }
@@ -98,25 +104,31 @@ module Jirarest2Bin
       puts e
       filefail = false
     end
-    scriptopts.url = scriptopts.url + "/rest/api/2/"
-    
-    if scriptopts.pass.nil? && !( scriptopts.username.nil?)  then
-      scriptopts.pass = Jirarest2Bin::get_password(scriptopts.username)
-    end
-    
+    scriptopts.url = (scriptopts.url + "/rest/api/2/") if !( scriptopts.url =~ /\/rest\/api\/2\/$/)
     missing = Array.new
     missing << "URL"  if scriptopts.url.nil?
     missing << "username" if  scriptopts.username.nil?
     if  missing != [] then
       puts "Missing essential parameter(s) #{missing.join(",")}. Exiting..."
       exit 1
+    end
+
+    if !scriptopts.nocookieauth then 
+      credentials = CookieCredentials.new(scriptopts.url,true)
+      credentials.load_cookiejar
+      return credentials
+      # TODO What to do if the cookie expired?
     else
-      return Credentials.new(scriptopts.url, scriptopts.username, scriptopts.pass)
+      if scriptopts.pass.nil? && !( scriptopts.username.nil?)  then
+        scriptopts.pass = Jirarest2Bin::get_password(scriptopts.username)
+      end
+      return PasswordCredentials.new(scriptopts.url, scriptopts.username, scriptopts.pass)
     end
   end # get_credentials
 
 
   # If there is already a connection known returns that connection. If not or if the parameter is true it tries to create a new Connect object
+  # @note Don't call this directly as it will fail if your credentials are wrong.
   # @param [Openstruct] scriptopts The Openstruct object that contains all the options relevant for the script
   # @param [Connect] connection An existing connection. Will be nil the first time we use it.
   # @param [Boolean] reconnect Loose an existing connection and build a new one
@@ -126,7 +138,10 @@ module Jirarest2Bin
       begin
         connection = Connect.new(get_credentials(scriptopts))
         connection.heal_uri! # We want to be sure so we try to heal the connection_url if possible
-        return connection
+        connection
+      rescue Jirarest2::CookieAuthenticationError => e
+        connection.credentials.login(scriptopts.username,scriptopts.pass)
+        retry
       rescue Jirarest2::CouldNotHealURIError => e
         puts "REST API not found at #{e.to_s}"
         exit 3
@@ -135,7 +150,40 @@ module Jirarest2Bin
       return connection
     end
   end # get_connection
-  
+
+  # Execute a command to the server
+  # This version is safe if the credentials are wrong. Extend the case if more requests should be safeguarded.
+  # @param [Array] scriptopts Command line options from the calling script
+  # @param [Connection,Nil] connection a connection we er to use
+  # @param [Symbol] command to execute
+  # @param [Array] *args Arguments for the commands to call
+  # @return [Connection] The connection we used
+  # @return [Object] The object that was called in the command
+  # @example get a Connection object
+  #     connection = Jirarest2Bin::command(@scriptopts,@connection,:connection)
+  def self.command(scriptopts,connection,command,*args)
+    begin
+      if connection.nil? then
+        connection = get_connection(scriptopts,connection)
+      end
+      case command
+      when :issue
+        return connection, Issue.new(args[0],args[1],connection)
+      when :connection
+        return connection
+      end
+    rescue Jirarest2::PasswordAuthenticationError => e
+      scriptopts.pass = Jirarest2Bin.get_password(scriptopts.username)
+      retry
+    rescue Jirarest2::CookieAuthenticationError => e
+      connection.credentials.login(scriptopts.username,scriptopts.pass)
+      retry
+    rescue Jirarest2::AuthenticationCaptchaError => e
+      puts "Wrong Password too many times.\nCaptcha time at #{e.to_s} to reenable your account."
+        exit 1
+      end
+    
+  end
 
   # This method is here because I am to lazy to rewrite the options every time
   # use it with scriptopts = Jirarest2Bin::defaultoptions(opts,scriptopts)
@@ -161,7 +209,7 @@ module Jirarest2Bin
     end
     
     
-    opts.on_tail("-u", "--username USERNAME", "Your Jira Username if you don't want to use the one in the master file") do |u|
+    opts.on_tail("-u", "--username USERNAME", "Your Jira Username if it is not the one in the master file") do |u|
       scriptopts.username = u 
     end
     
@@ -176,6 +224,10 @@ module Jirarest2Bin
       scriptopts.url = url
     end
     
+    opts.on_tail("--no-cookie", "Don't try to authenticate via cookies") do |nocookie|
+      scriptopts.nocookieauth = true
+    end
+
     opts.on_tail("-h", "--help", "Display this screen") do
       puts opts
       exit

data/test/test_comment.rb

@@ -6,7 +6,7 @@ require "jirarest2/services/comment"
 
 class TestComment < MiniTest::Unit::TestCase
   def setup
-    cred = Credentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
+    cred = PasswordCredentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
     @con = Connect.new(cred)
   end
 

data/test/test_connect.rb

@@ -1,16 +1,17 @@
 require "minitest/autorun"
 require "jirarest2/connect"
-require "jirarest2/credentials"
+require "jirarest2/password_credentials"
+require "jirarest2/cookie_credentials"
 require "webmock/minitest"
 
 class TestConnect < MiniTest::Unit::TestCase
   def setup
-    cred = Credentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
+    cred = PasswordCredentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
     @con = Connect.new(cred)
   end
   
   def test_access
-    stub_request(:any,"http://localhost:2990/jiar/rest/api/2/").with(:headers => {"Content-Type:" => "application/json;charset=UTF-8"})
+    stub_request(:any,"http://localhost:2990/jira/rest/api/2/").with(:headers => {"Content-Type:" => "application/json;charset=UTF-8"})
   end
 
   def test_executeGET    
@@ -32,7 +33,7 @@ class TestConnect < MiniTest::Unit::TestCase
   
   def test_check_uri_false
     stub_request(:get, "http://test:1234@localhost:2990/rest/api/2/dashboard").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 400, :body => "", :headers => {})
-    cred = Credentials.new("http://localhost:2990/rest/api/2/","test","1234")
+    cred = PasswordCredentials.new("http://localhost:2990/rest/api/2/","test","1234")
     con1 = Connect.new(cred)
     assert_equal false,con1.check_uri
   end
@@ -40,7 +41,7 @@ class TestConnect < MiniTest::Unit::TestCase
   def test_heal_uri
     stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/dashboard").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => "", :headers => {})
 
-    cred = Credentials.new("http://localhost:2990/jira//rest/api//2//","test","1234")
+    cred = PasswordCredentials.new("http://localhost:2990/jira//rest/api//2//","test","1234")
     con = Connect.new(cred)
     assert_equal "http://localhost:2990/jira/rest/api/2/",con.heal_uri
     assert_equal "http://localhost:2990/jira/rest/api/2/",con.heal_uri("http://localhost:2990/jira/rest/api/2/rest/api/2/")
@@ -59,7 +60,7 @@ class TestConnect < MiniTest::Unit::TestCase
     stub_request(:get, "http://test:1234@localhost:2990/jira//rest/api//2//dashboard").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 404, :body => '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><status><status-code>404</status-code><message>null for uri: http://localhost:2990/jira//rest/api//2//dashboard</message></status>', :headers => {"X-AUSERNAME" => "test" })
 
     ## First an URL we can fix
-    cred = Credentials.new("http://localhost:2990/jira//rest/api//2//","test","1234")
+    cred = PasswordCredentials.new("http://localhost:2990/jira//rest/api//2//","test","1234")
     con = Connect.new(cred)
     assert_equal false,con.check_uri
     
@@ -71,7 +72,7 @@ class TestConnect < MiniTest::Unit::TestCase
   def test_notworking_heal_uri!
     stub_request(:get, "http://test:1234@localhost:2990/secure/Dashboard.jspadashboard").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 400, :body => "", :headers => {})
     ## And now one we cant't fix
-    cred = Credentials.new("http://localhost:2990/secure/Dashboard.jspa","test","1234")
+    cred = PasswordCredentials.new("http://localhost:2990/secure/Dashboard.jspa","test","1234")
     con = Connect.new(cred)
     assert_equal false,con.check_uri
     assert_raises(Jirarest2::CouldNotHealURIError){ con.heal_uri! }

data/test/test_cookie_credentials.rb

@@ -0,0 +1,72 @@
+require "minitest/autorun"
+require "jirarest2/cookie_credentials"
+require "net/http"
+require "webmock/minitest"
+require "deb"
+
+class TestCookieCredentials < MiniTest::Unit::TestCase
+  
+  def setup
+    @cred = CookieCredentials.new("http://localhost:2990/jira/rest/api/2/")
+    @header = ["a.xsrf.token=BP8Q-WXN6-SKX3-NB5M|11ca22ad2bf3467bee711e5b912536d1fb046a4a|lout; Path=/myapp", "JSESSIONID=6C3AE9205FFC6E0DEC3353C2D10745D8; Path=/"]
+  end
+
+
+  def test_bake_cookies
+    result = {"a.xsrf.token"=> "BP8Q-WXN6-SKX3-NB5M|11ca22ad2bf3467bee711e5b912536d1fb046a4a|lout", "JSESSIONID"=>"6C3AE9205FFC6E0DEC3353C2D10745D8"}
+    assert_equal result, @cred.bake_cookies(@header)
+  end
+
+  def test_set_cookies
+    test_bake_cookies
+  end
+
+  def test_get_cookies
+    result = "a.xsrf.token=BP8Q-WXN6-SKX3-NB5M|11ca22ad2bf3467bee711e5b912536d1fb046a4a|lout; JSESSIONID=6C3AE9205FFC6E0DEC3353C2D10745D8"
+    @cred.bake_cookies(@header) # If this fails please see if test_bake_cookies fails as well
+    assert_equal result, @cred.get_cookies 
+  end
+
+  def test_get_auth_header
+    result = "a.xsrf.token=BP8Q-WXN6-SKX3-NB5M|11ca22ad2bf3467bee711e5b912536d1fb046a4a|lout; JSESSIONID=6C3AE9205FFC6E0DEC3353C2D10745D8"
+    uri = URI(@cred.connecturl)
+    @cred.bake_cookies(@header) # If this fails please see if test_bake_cookies fails as well
+    req = Net::HTTP::Get.new(uri.request_uri)
+    @cred.get_auth_header(req)
+    assert_instance_of Net::HTTP::Get, req # make sure we  still got the right requestor class
+    assert_equal result,req["Cookie"]
+  end
+  
+  def test_login_failed
+    stub_request(:post, "http://test:12345@localhost:2990/jira/rest/auth/latest/session").with(:body => "{\"username\":\"test\",\"password\":\"12345\"}",:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 401, :body => "", :headers => {})    
+    assert_raises(Jirarest2::PasswordAuthenticationError) {
+      @cred.login("test","12345")
+    }
+  end
+
+  def test_login_successful
+    stub_request(:post, "http://test:1234@localhost:2990/jira/rest/auth/latest/session").with(:body => "{\"username\":\"test\",\"password\":\"1234\"}",:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8'}).to_return(:status => 200, :body => '{"session":{"name":"JSESSIONID","value":"E8FE2A7CDB3306672665739A8E88D674"}}', :headers => {"Set-Cookie" => ["JSESSIONID=E8FE2A7CDB3306672665739A8E88D674; Path=/","a.xsrf.token=BP8Q-WXN6-SKX3-NB5M|39554775813b531f7dcba4aa28bb13b20e602eb9|lin; Path=/jira"]})
+    assert_equal "E8FE2A7CDB3306672665739A8E88D674", @cred.login("test","1234")
+  end
+  
+  def test_logout # requires test_login_successful to succeed, so not really good :(   )
+    stub_request(:post, "http://test:1234@localhost:2990/jira/rest/auth/latest/session").with(:body => "{\"username\":\"test\",\"password\":\"1234\"}",:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8'}).to_return(:status => 200, :body => '{"session":{"name":"JSESSIONID","value":"E8FE2A7CDB3306672665739A8E88D674"}}', :headers => {"Set-Cookie" => ["JSESSIONID=E8FE2A7CDB3306672665739A8E88D674; Path=/","a.xsrf.token=BP8Q-WXN6-SKX3-NB5M|39554775813b531f7dcba4aa28bb13b20e602eb9|lin; Path=/jira"]})
+    stub_request(:delete, "http://localhost:2990/jira/rest/auth/latest/session").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'Cookie'=>'JSESSIONID=E8FE2A7CDB3306672665739A8E88D674; a.xsrf.token=BP8Q-WXN6-SKX3-NB5M|39554775813b531f7dcba4aa28bb13b20e602eb9|lin', 'User-Agent'=>'Ruby'}).to_return(:status => 204, :body => "", :headers => {})
+    @cred.login("test","1234")
+    assert_equal true,@cred.logout
+  end
+
+  def test_store_cookiejar
+    @cred.cookiestore = File.dirname(__FILE__) + "/data/cookiejar"
+    @cred.bake_cookies(@header)
+    expect = {"a.xsrf.token"=>"BP8Q-WXN6-SKX3-NB5M|11ca22ad2bf3467bee711e5b912536d1fb046a4a|lout", "JSESSIONID"=>"6C3AE9205FFC6E0DEC3353C2D10745D8"}
+    assert_equal expect, @cred.store_cookiejar
+  end
+
+  def test_load_cookiejar
+    @cred.cookiestore = File.dirname(__FILE__) + "/data/cookiejar"
+    @cred.load_cookiejar
+    assert_equal "a.xsrf.token=BP8Q-WXN6-SKX3-NB5M|11ca22ad2bf3467bee711e5b912536d1fb046a4a|lout; JSESSIONID=6C3AE9205FFC6E0DEC3353C2D10745D8", @cred.get_cookies
+  end
+
+end

data/test/test_credentials.rb

@@ -1,38 +1,26 @@
 require "minitest/autorun"
-require "jirarest2"
+require "jirarest2/credentials"
+require "jirarest2/exceptions"
 
 class TestCredentials < MiniTest::Unit::TestCase
   def setup
-    @cred = Credentials.new("https://localhost:2990","username","password")
-    @credc =  Credentials.new("https://localhost:2990","username","password")
+    @cred = Credentials.new("https://localhost:2990")
   end
   
   def testInitialize
-    assert_instance_of(Credentials, Credentials.new("https://localhost:2990","username","password") )
+    assert_instance_of(Credentials, Credentials.new("https://localhost:2990"))
     assert_raises(Jirarest2::NotAnURLError)  {
-      Credentials.new("localhost:2990","username","password")
+      Credentials.new("localhost:2990")
     }
     assert_equal "https://localhost:2990", @cred.connecturl
-    assert_equal "username", @cred.username
-    assert_equal "password", @cred.password
   end
 
   def testSetURL
-    @credc.connecturl = "http://localhost:80"
-    assert_equal "http://localhost:80", @credc.connecturl 
+    @cred.connecturl = "http://localhost:80"
+    assert_equal "http://localhost:80", @cred.connecturl 
     assert_raises(Jirarest2::NotAnURLError) {
-      @credc.connecturl = "localhost:80" 
+      @cred.connecturl = "localhost:80" 
     }
   end
   
-  def testSetPassword
-    @credc.password = "1234"
-    assert_equal "1234", @credc.password
-  end
-
-  def testSetUsername
-    @credc.username = "test"
-    assert_equal "test", @credc.username
-  end
-
 end

data/test/test_issue.rb

@@ -5,7 +5,7 @@ require "webmock/minitest"
 
 class TestIssue < MiniTest::Unit::TestCase
   def setup
-    @credentials = Credentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
+    @credentials = PasswordCredentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
     @connect = Connect.new(@credentials)
     raw_response_file = File.new(File.dirname(__FILE__)+"/data/issuespec.txt")
     stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issue/createmeta/?expand=projects.issuetypes.fields&issuetypeNames=My%20issue%20type&projectKeys=MFTP").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(raw_response_file)

data/test/test_issuelink.rb

@@ -8,7 +8,7 @@ require "webmock/minitest"
 
 class TestIssueLink < MiniTest::Unit::TestCase
   def setup
-    cred = Credentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
+    cred = PasswordCredentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
     @con = Connect.new(cred)
     stub_request(:get, "http://test:1234@localhost:2990/jira/rest/api/2/issueLinkType").with(:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 200, :body => '{"issueLinkTypes":[{"id":"10000","name":"Blocks","inward":"is blocked by","outward":"blocks","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10000"},{"id":"10001","name":"Cloners","inward":"is cloned by","outward":"clones","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10001"},{"id":"10002","name":"Duplicate","inward":"is duplicated by","outward":"duplicates","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10002"},{"id":"10003","name":"Relates","inward":"relates to","outward":"relates to","self":"http://localhost:2990/jira/rest/api/2/issueLinkType/10003"}]}', :headers => {})
     @link = IssueLink.new(@con)
@@ -18,7 +18,7 @@ class TestIssueLink < MiniTest::Unit::TestCase
   def test_link_issue_access
     # check for right to link.
     stub_request(:post, "http://test:1234@localhost:2990/jira/rest/api/2/issueLink").with(:body => "{\"type\":{\"name\":\"Blocks\"},\"inwardIssue\":{\"key\":\"MFTP-6\"},\"outwardIssue\":{\"key\":\"SP-2\"}}",:headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json;charset=UTF-8', 'User-Agent'=>'Ruby'}).to_return(:status => 401, :body => '{"errorMessages":["No Link Issue Permission for issue \'MFTP-6\'"],"errors":{}}', :headers => {})
-    assert_raises(Jirarest2::AuthentificationError) {
+    assert_raises(Jirarest2::PasswordAuthenticationError) {
       @link.link_issue("MFTP-6","SP-2","Blocks")
     }
   end

data/test/test_issuelinktype.rb

@@ -8,7 +8,7 @@ require "webmock/minitest"
 
 class TestIssueLinkType < MiniTest::Unit::TestCase
   def setup
-    cred = Credentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
+    cred = PasswordCredentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
     @con = Connect.new(cred)
   end
 

data/test/test_madbitconfig.rb

@@ -1,6 +1,6 @@
 require "minitest/autorun"
 require "jirarest2/madbitconfig"
-require "pp"
+require "deb"
 
 class TestConfig < MiniTest::Unit::TestCase
 

data/test/test_password_credentials.rb

@@ -0,0 +1,26 @@
+require "minitest/autorun"
+require "jirarest2/password_credentials"
+
+class TestPasswordCredentials < MiniTest::Unit::TestCase
+  def setup
+    @cred = PasswordCredentials.new("https://localhost:2990","username","password")
+  end
+  
+  def testInitialize
+    assert_instance_of(PasswordCredentials, @cred)
+    assert_equal "https://localhost:2990", @cred.connecturl
+    assert_equal "username", @cred.username
+    assert_equal "password", @cred.password
+  end
+
+  def testSetPassword
+    @cred.password = "1234"
+    assert_equal "1234", @cred.password
+  end
+
+  def testSetUsername
+    @cred.username = "test"
+    assert_equal "test", @cred.username
+  end
+
+end

data/test/test_result.rb

@@ -6,7 +6,7 @@ require "webmock/minitest"
 
 class TestResult < MiniTest::Unit::TestCase
   def setup
-    cred = Credentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
+    cred = PasswordCredentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
     @con = Connect.new(cred)
   end
 

data/test/test_watcher.rb

@@ -7,7 +7,7 @@ require "webmock/minitest"
 
 class TestWatcher < MiniTest::Unit::TestCase
   def setup
-    cred = Credentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
+    cred = PasswordCredentials.new("http://localhost:2990/jira/rest/api/2/","test","1234")
     @con = Connect.new(cred)
   end
   
@@ -27,7 +27,7 @@ class TestWatcher < MiniTest::Unit::TestCase
     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) { 
+    assert_raises(Jirarest2::PasswordAuthenticationError) { 
       watchers.remove_watcher("cebit")
     }
   end
@@ -36,7 +36,7 @@ class TestWatcher < MiniTest::Unit::TestCase
     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) {
+    assert_raises(Jirarest2::PasswordAuthenticationError) {
       watcherna.add_watcher("cebit")
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jirarest2
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ cert_chain:
   -----END CERTIFICATE-----
 
 '
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -136,7 +136,7 @@ description: ! "jirarest2 is yet another implementation of the JIRA(tm) REST-API
   .  This one for Ruby1.9.1\n\nIt is intended to be called within the shell to create
   and verify JIRA(tm) issues fast without a browser. There was no particular need
   for perfomance at the time of writing.\n\nThis implementation is still a for cry
-  from others like http://rubygems.org/gems/jira-ruby which requires oauth authentification.
+  from others like http://rubygems.org/gems/jira-ruby which requires oauth authentication.
   \n\nThere are scripts to create new issues with watchers and link those to existing
   issues and to manipulate watchers on existing issues.\n\n *Use it at your own risk.
   Most of the API features are not implemented.*\n\n *Ruby1.9.1 is needed. Ruby1.8
@@ -144,10 +144,8 @@ description: ! "jirarest2 is yet another implementation of the JIRA(tm) REST-API
 email:
 - cebit-jirarest@gunnet.de
 executables:
-- create_issue.rb
 - jira_comment
 - jira_create_issue
-- jira_create_issue.rb
 - jira_watcher
 extensions: []
 extra_rdoc_files:
@@ -161,18 +159,19 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- bin/create_issue.rb
 - bin/jira_comment
 - bin/jira_create_issue
-- bin/jira_create_issue.rb
 - bin/jira_watcher
 - copyright
+- lib/deb.rb
 - lib/jirarest2.rb
 - lib/jirarest2/connect.rb
+- lib/jirarest2/cookie_credentials.rb
 - lib/jirarest2/credentials.rb
 - lib/jirarest2/exceptions.rb
 - lib/jirarest2/issue.rb
 - lib/jirarest2/madbitconfig.rb
+- lib/jirarest2/password_credentials.rb
 - lib/jirarest2/result.rb
 - lib/jirarest2/services.rb
 - lib/jirarest2/services/comment.rb
@@ -180,6 +179,7 @@ files:
 - lib/jirarest2/services/issuelinktype.rb
 - lib/jirarest2/services/watcher.rb
 - lib/jirarest2bin.rb
+- test/data/cookiejar
 - test/data/get-comments.txt
 - test/data/issuespec.txt
 - test/data/test.config.data
@@ -189,11 +189,13 @@ files:
 - test/data/ticket.json
 - test/test_comment.rb
 - test/test_connect.rb
+- test/test_cookie_credentials.rb
 - test/test_credentials.rb
 - test/test_issue.rb
 - test/test_issuelink.rb
 - test/test_issuelinktype.rb
 - test/test_madbitconfig.rb
+- test/test_password_credentials.rb
 - test/test_result.rb
 - test/test_watcher.rb
 - .gemtest
@@ -228,10 +230,12 @@ summary: jirarest2 is yet another implementation of the JIRA(tm) REST-API[https:
 test_files:
 - test/test_madbitconfig.rb
 - test/test_connect.rb
+- test/test_cookie_credentials.rb
 - test/test_issuelinktype.rb
 - test/test_comment.rb
 - test/test_credentials.rb
 - test/test_issue.rb
+- test/test_password_credentials.rb
 - test/test_result.rb
 - test/test_issuelink.rb
 - test/test_watcher.rb

data/bin/jira_create_issue.rb

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-
-# Script to create a new issue with jira.
-#    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/>.
-#
-
-puts "File has been renamed to jira_create_issue"
-newfile = File.dirname($0) + "/jira_create_issue"
-puts "Please use: #{newfile} #{$*.join(" ")}"
-