fogbugz 1.0.6 → 1.0.7

data/bin/fogbugz

@@ -1,8 +1,6 @@
 #!/usr/bin/env ruby
 require 'fogbugz/common'
 
-check_api_url
-
 dispatch_subcommand __FILE__,
   :areas        => 'List active areas.',
   :assign       => 'Assign a case.',

data/bin/fogbugz-estimate

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require 'fogbugz/common'
+
+check_api_url
+check_api_token
+
+parse_opts "usage: #{File::basename(__FILE__)} [options] <case> <estimate>", 2
+do_api('edit', :ixBug => ARGV[0], :hrsCurrEst => ARGV[1])

data/bin/fogbugz-filter

@@ -4,8 +4,8 @@ require 'fogbugz/common'
 check_api_url
 check_api_token
 
-api_url = ENV['FOGBUGZ_API_URL']
-api_token = ENV['FOGBUGZ_API_TOKEN']
+api_url = CONFIG[:api_url]
+api_token = CONFIG[:api_token]
 
 parse_opts "usage: #{File::basename(__FILE__)} [options] <filter>", 1
 

data/bin/fogbugz-login

@@ -1,14 +1,22 @@
 #!/usr/bin/env ruby
 require 'fogbugz/common'
 
-check_api_url
-
 options = {}
 optparse = OptionParser.new do |opts|
-  opts.banner = "usage: #{File::basename(__FILE__)} [options] <email>"
+  opts.banner = "usage: #{File::basename(__FILE__)} [options]"
+
+  options[:email] = nil
+  opts.on_tail('--email=<email>') do |password|
+    options[:email] = password
+  end
+
+  options[:api_url] = nil
+  opts.on_tail('--apiurl=<apiurl>') do |api_url|
+    options[:api_url] = api_url
+  end
 
   options[:password] = nil
-  opts.on_tail('-p', '--password=<password>') do |password|
+  opts.on_tail('--password=<password>') do |password|
     options[:password] = password
   end
 
@@ -18,17 +26,15 @@ optparse = OptionParser.new do |opts|
   end
 end
 optparse.parse!
-unless ARGV.length == 1
-  puts optparse.help
-  exit 1
-end
 
+api_url = options[:api_url] || CONFIG[:api_url] ||
+  HighLine.new.ask('API URL: ')
+email = options[:email] || CONFIG[:email] ||
+  HighLine.new.ask('Email: ')
 password = options[:password] ||
   HighLine.new.ask('Password: ') { |q| q.echo = false }
 
-api_url = ENV['FOGBUGZ_API_URL']
-
-uri = URI("#{api_url}?cmd=logon&email=#{URI.escape(ARGV[0])}&" +
+uri = URI("#{api_url}?cmd=logon&email=#{URI.escape(email)}&" +
           "password=#{URI.escape(password)}")
 http = Net::HTTP.new(uri.host, uri.port)
 if uri.scheme == 'https'
@@ -50,7 +56,8 @@ if error
   exit 1
 end
 
-puts <<HERE
-Login successful. Set the following environment variable:
-export FOGBUGZ_API_TOKEN=#{result.elements['/response/token'].text}
-HERE
+puts "Login successful."
+CONFIG[:email] = email
+CONFIG[:api_url] = api_url
+CONFIG[:api_token] = "#{result.elements['/response/token'].text}"
+IO::write(CONFIG_FILE, CONFIG.to_yaml)

data/bin/fogbugz-logoff

@@ -6,3 +6,6 @@ check_api_token
 
 parse_opts "usage: #{File::basename(__FILE__)} [options]", 0
 do_api 'logoff'
+
+CONFIG[:api_token] = nil
+IO::write(CONFIG_FILE, CONFIG.to_yaml)

data/lib/fogbugz/common.rb

@@ -9,6 +9,13 @@ require 'English'
 require 'time'
 require 'chronic'
 
+CONFIG_FILE = Dir.home + '/.fogbugzrc'
+begin
+CONFIG = YAML::load(IO::read(CONFIG_FILE))
+rescue
+CONFIG = {}
+end
+
 HighLine.use_color = STDOUT.isatty
 begin
   require 'win32console' if RUBY_PLATFORM =~ /mingw/
@@ -24,15 +31,15 @@ def m; HighLine.use_color? ? HighLine::MAGENTA : ''; end
 def c; HighLine.use_color? ? HighLine::CLEAR   : ''; end
 
 def check_api_url
-  unless ENV['FOGBUGZ_API_URL']
-    puts "Environment variable FOGBUGZ_API_URL must be set."
+  unless CONFIG[:api_url]
+    puts "Not logged in."
     exit 1
   end
 end
 
 def check_api_token
-  unless ENV['FOGBUGZ_API_TOKEN']
-    puts "Environment variable FOGBUGZ_API_TOKEN must be set."
+  unless CONFIG[:api_token]
+    puts "Not logged in."
     exit 1
   end
 end
@@ -293,8 +300,8 @@ def maybe_literal(xml)
 end
 
 def do_api(cmd, params={})
-  api_url = ENV['FOGBUGZ_API_URL']
-  api_token = ENV['FOGBUGZ_API_TOKEN']
+  api_url = CONFIG[:api_url]
+  api_token = CONFIG[:api_token]
 
   query = ''
   params.each_pair do |k,v|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fogbugz
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -54,6 +54,7 @@ executables:
 - fogbugz-categories
 - fogbugz-close
 - fogbugz-edit
+- fogbugz-estimate
 - fogbugz-filter
 - fogbugz-filters
 - fogbugz-list
@@ -81,6 +82,7 @@ files:
 - bin/fogbugz-categories
 - bin/fogbugz-close
 - bin/fogbugz-edit
+- bin/fogbugz-estimate
 - bin/fogbugz-filter
 - bin/fogbugz-filters
 - bin/fogbugz-list