ki_youtrack 0.0.1 → 0.0.2

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 spec/fixtures
+spec/configs

data/bin/ki_youtrack

@@ -33,25 +33,36 @@ command :issue do |c|
     pretty = $stdout.tty?
 
     id = args.first
-    json = KiYoutrack::Api.issue(id, :pretty => pretty)
-    $stdout.puts(json)
+
+    begin
+    api = KiYoutrack::Api.new
+    json = api.issue(id, :pretty => pretty)
+      $stdout.puts(json)
+    rescue Kiseru::ConfigError => e
+      $stderr.puts e.message
+      $stderr.puts "Run 'ki_youtrack init' or edit #{api.config.path}"
+      exit 1
+    rescue KiYoutrack::SessionError => e
+      $stderr.puts e.message
+      exit 1
+    end
   end
 end
 
-desc 'Set up config file'
-command :setup do |c|
-  c.action do |global_options, options, args|
-    config = Kiseru::Config[:ki_youtrack]
-
-    ui = HighLine.new
-
-    username = config.read(:username) || ui.ask("Username: ")
-    password = config.read(:password) || ui.ask("Password: ") { |q| q.echo = false }
-    subdomain = config.read(:subdomain) || ui.ask("Subdomain: ")
+on_error do |error|
+  case error
+  when SystemExit
+    exit error.status
+    false
+  else
+    true
+  end
+end
 
-    config.write(:username, username)
-    config.write(:password, password)
-    config.write(:subdomain, subdomain)
+desc 'Initialize config file'
+command :init do |c|
+  c.action do |global_options, options, args|
+    KiYoutrack::Initializer.init
   end
 end
 

data/ki_youtrack.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency('highline')
 
   gem.add_development_dependency('debugger')
+  gem.add_development_dependency('rake')
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('simplecov')
   gem.add_development_dependency('test-construct')

data/lib/ki_youtrack/api.rb

@@ -2,17 +2,26 @@ module KiYoutrack
 
   class Api
 
-    def self.issue(id, opts = {})
-      config = Kiseru::Config[:ki_youtrack]
-      username = config.read(:username)
-      password = config.read(:password)
-      subdomain = config.read(:subdomain)
-      ssl = config.read(:ssl)
-      session = Session.new(username, password, subdomain, :ssl => ssl)
-      session.init
-      response = session.get_bug(id)
-
-      filtered_data = IssueFilter.filter(response.body['issue'])
+    attr_reader :config
+
+    def initialize(config=Kiseru::Config[:ki_youtrack])
+      @config = config
+    end
+
+    def issue(id, opts = {})
+      config.ensure_present(:login, :password, :subdomain, :ssl)
+
+      login = @config.read(:login)
+      password = @config.read(:password)
+      subdomain = @config.read(:subdomain)
+      ssl = @config.read(:ssl)
+
+      session = Session.new(login, password, subdomain, :ssl => ssl)
+      response = session.init
+
+      issue = session.issue(id)
+
+      filtered_data = IssueFilter.filter(issue)
       MultiJson.dump(filtered_data, :pretty => opts[:pretty])
     end
 

data/lib/ki_youtrack/initializer.rb

@@ -0,0 +1,41 @@
+module KiYoutrack
+
+  class Initializer
+
+    def self.init
+      config = Kiseru::Config[:ki_youtrack]
+
+      ui = HighLine.new
+
+      $stdout.puts "Initializing config file at #{config.path}"
+
+      old_subdomain = config.read(:subdomain)
+      old_ssl = config.read(:ssl)
+      old_login = config.read(:login)
+      old_password = config.read(:password)
+
+      subdomain = ui.ask("Subdomain: ") { |q| q.default = old_subdomain }
+      convert_to_boolean = lambda do |string|
+        return true if string.downcase == "true"
+        return false if string.downcase == "false"
+        string
+      end
+      ssl = ui.ask("SSL?: ", convert_to_boolean) do |q|
+        q.default = old_ssl || "true";
+        q
+      end
+      login = ui.ask("Login (or email): ") { |q| q.default = old_login }
+
+      $stdout.puts "WARNING: Your YouTrack password will be written in plaintext to #{config.path}"
+      password = ui.ask("Password: ") { |q| q.echo = "*" }
+
+      config.write(:login, login)
+      config.write(:password, password)
+      config.write(:subdomain, subdomain)
+      config.write(:ssl, ssl)
+
+    end
+
+  end
+
+end

data/lib/ki_youtrack/kiseru.rb

@@ -1,16 +1,23 @@
+require 'pathname'
+require 'fileutils'
+
 module Kiseru
 
+  class ConfigError < StandardError; end;
+
   class ConfigDir
 
-    DIR_NAME = '.kiseru'
+    NAME = '.kiseru'
 
     attr_reader :path
 
     def initialize(opts = {})
+      name = opts.fetch(:name) { NAME }
       root = Pathname.new(File.expand_path(opts.fetch(:root) { '~' }))
-      @path = root + DIR_NAME
+      @path = root + name
       unless File.directory?(@path)
         Dir.mkdir(@path)
+        FileUtils.chmod(0700, @path)
       end
     end
 
@@ -22,18 +29,34 @@ module Kiseru
 
   class Config
 
+    attr_reader :path
+
     def self.[](key)
       ConfigDir.new.config(key)
     end
 
     def initialize(root_path, app_name)
-      file_path = (root_path + "#{app_name}.yml").to_s
-      @store = YAML::Store.new(file_path)
+      @path = (root_path + "#{app_name}.yml").to_s
+      unless File.exists?(@path)
+        FileUtils.touch(@path)
+        FileUtils.chmod(0600, @path)
+      end
+      @store = YAML::Store.new(@path)
+      @store.transaction do
+      end
+    end
+
+    def ensure_present(*keys)
+      keys.each do |key|
+        if read(key).nil?
+          raise ConfigError, "'#{key}' is not defined in config"
+        end
+      end
     end
 
-    def write(key, time)
+    def write(key, value)
       @store.transaction do
-        @store[key] = time
+        @store[key] = value
       end
     end
 

data/lib/ki_youtrack/session.rb

@@ -1,5 +1,7 @@
 module KiYoutrack
 
+  class SessionError < StandardError; end;
+
   class Session
 
     attr_reader :session_cookies, :api_url
@@ -12,26 +14,50 @@ module KiYoutrack
       "#{protocol}://#{subdomain}.myjetbrains.com"
     end
 
-    def initialize(username, password, subdomain, opts = {})
+    def initialize(login, password, subdomain, opts = {})
       ssl = opts.fetch(:ssl, true)
-      @username = username
+      @login = login
       @password = password
       @api_url = Session.url(subdomain, ssl)
     end
 
     def init
       response = connection.post("/youtrack/rest/user/login",
-                      :login => @username,
+                      :login => @login,
                       :password => @password)
       @session_cookies = response.headers['set-cookie']
-      response
+      case response.status
+      when 404
+        if response.body =~ /HTTPS is supported in paid version only/
+          raise SessionError, "Authentication failed because HTTPS is not supported for this domain."
+        else
+          raise SessionError, "Authentication failed. Check subdomain and SSL settings."
+        end
+      when 302
+        raise SessionError, "Authentication failed. Check subdomain."
+      when 403
+        raise SessionError, "Authentication failed. Check login and password."
+      when 200
+        response
+      else
+        raise SessionError, "Unhandled status code #{response.status}"
+      end
     end
 
-    def get_bug(id)
-      connection.get do |req|
+    def issue(id)
+      response = connection.get do |req|
         req.url "/youtrack/rest/issue/#{id}"
         req.headers['Cookie'] = session_cookies
       end
+
+      case response.status
+      when 200
+        response.body['issue']
+      when 404
+        raise SessionError, "Can't find issue #{id}"
+      else
+        raise SessionError, "Unhandled status code #{response.status}"
+      end
     end
 
     private

data/lib/ki_youtrack/version.rb

@@ -1,3 +1,3 @@
 module KiYoutrack
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/ki_youtrack.rb

@@ -10,6 +10,7 @@ autoload :Kiseru, 'ki_youtrack/kiseru'
 
 module KiYoutrack
 
+  autoload :Initializer, 'ki_youtrack/initializer'
   autoload :Api, 'ki_youtrack/api'
   autoload :Creds, 'ki_youtrack/creds'
   autoload :Session, 'ki_youtrack/session'

data/spec/integration/get_bug_spec.rb

@@ -4,21 +4,28 @@ include KiYoutrack
 
 describe KiYoutrack::Api do
 
+  let(:config) do
+    Kiseru::ConfigDir.new(:root => SPEC_DIR,
+                          :name => SPEC_CONFIG_DIR).config(:ki_youtrack)
+  end
+
   it "gets JSON for issue", :vcr do
-    json = Api.issue("KI-1")
+    api = Api.new(config)
+    json = api.issue("KI-1")
     data = MultiJson.load(json)
     data['id'].should == 'KI-1'
     data['ki_type'].should == 'youtrack_issue'
   end
 
   it "pretty prints JSON if requested", :vcr do
-    json = Api.issue("KI-1", :pretty => false)
+    api = Api.new(config)
+    json = api.issue("KI-1", :pretty => false)
 
     pretty_json = MultiJson.dump(MultiJson.load(json), :pretty => true)
     normal_json = MultiJson.dump(MultiJson.load(json), :pretty => false)
 
     json.should == normal_json
-    Api.issue("KI-1", :pretty => true).should == pretty_json
+    api.issue("KI-1", :pretty => true).should == pretty_json
   end
 
 end

data/spec/spec_helper.rb

@@ -13,6 +13,9 @@ require 'construct'
 include Construct::Helpers
 include KiYoutrack
 
+SPEC_DIR = File.expand_path(File.dirname(__FILE__))
+SPEC_CONFIG_DIR = 'configs'
+
 if [0, 'false', false, 'f', 'n', 'no', 'off'].include?(ENV['VCR'])
   puts "VCR off"
 else

data/spec/unit/session_spec.rb

@@ -5,8 +5,9 @@ describe KiYoutrack::Session do
   before do
     # These tests will fail until you create a valid config file
     # by doing 'ki_youtrack setup'
-    config = Kiseru::Config[:ki_youtrack]
-    @username = config.read(:username)
+    config = Kiseru::ConfigDir.new(:root => SPEC_DIR,
+                                   :name => SPEC_CONFIG_DIR).config(:ki_youtrack)
+    @login = config.read(:login)
     @password = config.read(:password)
     @subdomain = config.read(:subdomain)
   end
@@ -16,26 +17,23 @@ describe KiYoutrack::Session do
     # a valid subdomain must be supplied otherwise the HTTP
     # status code will be 404 instead of 403
     session = Session.new("foo", "bar", @subdomain, :ssl => false)
-    response = session.init
-    response.status.should == 403
-    response.body['error'].should match /Incorrect login or password/
+    lambda do
+      response = session.init
+    end.should raise_error SessionError, /Authentication failed/
   end
 
   it "responds 200 and gets headers if creds are valid", :vcr do
-    session = Session.new(@username, @password, @subdomain, :ssl => false)
+    session = Session.new(@login, @password, @subdomain, :ssl => false)
     response = session.init
     response.status.should == 200
     response.headers["set-cookie"].should_not be_nil
     session.session_cookies.should == response.headers["set-cookie"]
   end
 
-  it "uses authentication cookies to get bug", :vcr do
-    session = Session.new(@username, @password, @subdomain, :ssl => false)
+  it "uses authentication cookies to get issue", :vcr do
+    session = Session.new(@login, @password, @subdomain, :ssl => false)
     session.init
-    response = session.get_bug("KI-1")
-    response.status.should == 200
-    response.body.should_not be_nil
-    issue = response.body['issue']
+    issue = session.issue("KI-1")
     issue['id'].should == "KI-1"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ki_youtrack
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000Z
+date: 2012-08-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &70324410656340 !ruby/object:Gem::Requirement
+  requirement: &70195634193200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324410656340
+  version_requirements: *70195634193200
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70324410655920 !ruby/object:Gem::Requirement
+  requirement: &70195634192780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324410655920
+  version_requirements: *70195634192780
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70324410655500 !ruby/object:Gem::Requirement
+  requirement: &70195634192360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324410655500
+  version_requirements: *70195634192360
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70324410655080 !ruby/object:Gem::Requirement
+  requirement: &70195634191940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324410655080
+  version_requirements: *70195634191940
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70324410654660 !ruby/object:Gem::Requirement
+  requirement: &70195611982480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324410654660
+  version_requirements: *70195611982480
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70324410654240 !ruby/object:Gem::Requirement
+  requirement: &70195611982060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324410654240
+  version_requirements: *70195611982060
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70324410653820 !ruby/object:Gem::Requirement
+  requirement: &70195611981640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324410653820
+  version_requirements: *70195611981640
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70195611981220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70195611981220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70324410653400 !ruby/object:Gem::Requirement
+  requirement: &70195611980800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324410653400
+  version_requirements: *70195611980800
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70324410652980 !ruby/object:Gem::Requirement
+  requirement: &70195611980380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324410652980
+  version_requirements: *70195611980380
 - !ruby/object:Gem::Dependency
   name: test-construct
-  requirement: &70324410652560 !ruby/object:Gem::Requirement
+  requirement: &70195611979960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324410652560
+  version_requirements: *70195611979960
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70324410652140 !ruby/object:Gem::Requirement
+  requirement: &70195611979540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324410652140
+  version_requirements: *70195611979540
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70324410651720 !ruby/object:Gem::Requirement
+  requirement: &70195611979120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324410651720
+  version_requirements: *70195611979120
 description: Kiseru YouTrack client
 email:
 - ben@freeagent.com
@@ -164,6 +175,7 @@ files:
 - lib/ki_youtrack.rb
 - lib/ki_youtrack/api.rb
 - lib/ki_youtrack/creds.rb
+- lib/ki_youtrack/initializer.rb
 - lib/ki_youtrack/issue_filter.rb
 - lib/ki_youtrack/kiseru.rb
 - lib/ki_youtrack/session.rb