ruby_bugzilla 0.5.1 → 0.5.2

data/data/cookies_file

@@ -0,0 +1 @@
+spec test fake cookies_file

data/lib/ruby_bugzilla.rb

@@ -1,6 +1,9 @@
+require 'fileutils'
 require 'linux_admin'
+require 'tempfile'
 require "xmlrpc/client"
 
+
 class RubyBugzilla
   CLONE_FIELDS = [:assigned_to, :cc, :cf_devel_whiteboard, :cf_internal_whiteboard, :component,
     :groups, :keywords, :op_sys, :platform, :priority, :product, :qa_contact, :severity,
@@ -12,14 +15,6 @@ class RubyBugzilla
     File.exists?(CMD)
   end
 
-  def self.logged_in?
-    File.exists?(COOKIES_FILE)
-  end
-
-  def self.clear_login!
-    File.delete(COOKIES_FILE) if File.exists?(COOKIES_FILE)
-  end
-
   attr_accessor :bugzilla_uri, :username, :password, :last_command, :xmlrpc
   attr_reader   :bugzilla_request_uri, :bugzilla_request_hostname
 
@@ -38,6 +33,8 @@ class RubyBugzilla
     self.password     = password
     self.xmlrpc       = ::XMLRPC::Client.new(bugzilla_request_hostname, '/xmlrpc.cgi', 443, nil,
       nil, username, password, true, 60)
+
+    login
   end
 
   def inspect
@@ -48,20 +45,21 @@ class RubyBugzilla
     self.class.installed?
   end
 
-  def logged_in?
-    self.class.logged_in?
-  end
-
   def clear_login!
-    self.class.clear_login!
-  end
+    cookies_file_entry = "HttpOnly_.#{bugzilla_request_hostname}"
 
-  def login
-    if logged_in?
-      self.last_command = nil
-      return "Already Logged In"
+    if File.exists?(COOKIES_FILE)
+      Tempfile.open('ruby_bugzilla') do |out_file|
+        File.read(COOKIES_FILE).each_line do |line|
+          out_file.puts(line) unless line.include?(cookies_file_entry)
+        end
+        out_file.close()
+        FileUtils.mv(out_file.path, COOKIES_FILE)
+      end
     end
+  end
 
+  def login
     params = {}
     params["--debug"] = nil
     params["login"]   = [username, password]

data/lib/ruby_bugzilla/version.rb

@@ -1,3 +1,3 @@
 class RubyBugzilla
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/ruby_bugzilla_spec.rb

@@ -7,18 +7,8 @@ describe RubyBugzilla do
     # Assume most tests have bugzilla installed and logged in by faking with
     #   valid files
     stub_const("RubyBugzilla::CMD", "/bin/echo")
-    stub_const("RubyBugzilla::COOKIES_FILE", "/bin/echo")
-  end
-
-  context ".logged_in?" do
-    it "with an existing bugzilla cookie" do
-      RubyBugzilla.logged_in?.should be_true
-    end
+    stub_const("RubyBugzilla::COOKIES_FILE", File.expand_path("data/cookies_file", File.dirname(__FILE__)))
 
-    it "with no bugzilla cookie" do
-      stub_const("RubyBugzilla::COOKIES_FILE", "/This/file/does/not/exist")
-      RubyBugzilla.logged_in?.should be_false
-    end
   end
 
   context "#new" do
@@ -42,16 +32,13 @@ describe RubyBugzilla do
 
   context "#login" do
     it "when already logged in" do
-      output = bz.login
-
-      bz.last_command.should be_nil
-      output.should include("Already Logged In")
+      bz.login
+      bz.last_command.should include("login")
     end
 
     it "when not already logged in" do
       stub_const("RubyBugzilla::COOKIES_FILE", "/This/file/does/not/exist")
       bz.login
-
       bz.last_command.should include("login")
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_bugzilla
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,6 +107,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- data/cookies_file
 - lib/ruby_bugzilla.rb
 - lib/ruby_bugzilla/version.rb
 - ruby_bugzilla.gemspec
@@ -125,12 +126,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1898081452312934278
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1898081452312934278
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25