jira_report 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 426236177e3ecba31533d4d70783a02fd3c1a39e
-  data.tar.gz: ce26fba802985e9781a037643e0effcc6e7d5742
+  metadata.gz: 3a9197875b688ab8f04bca3835f25bc7edb62ac7
+  data.tar.gz: c048244ac02abeaad3fa7ff017d24bbef0869e4a
 SHA512:
-  metadata.gz: 9e1dd5d086623cb5d271349b13a309eb10f7102f4c68b3dcd02af887d8b83ba7163d1a6ebe58d230e25e9e5ace310e5e3ef696e30f634476cf3c401c3fd7a903
-  data.tar.gz: 4b5fe161b7e8af39ad69008f5ecbd0ed4bcc9c076c95c22cf9f127e5a245141fb623c98904992415f5955d799e5be5429723018d5a6f58acca48072d002266f2
+  metadata.gz: aa32b19bbf05ec4c43208314a4bc73b4beef7bf2edfaa8df2249f054aa089b4d4f4eac9659c3d2e507cb5423fcb5604e0489bb46afb82cae6cd715dfc54c0349
+  data.tar.gz: 192b673da211b18c7725ab369e0434b03533ddb5038a7890c2cd211da1d06664e289c19a2cd7eed69b678f8d9ea00c93e1e69451c61100f0c8a61f0ce79d26c6

data/README.md

@@ -1,27 +1,23 @@
-[![Gem Version](https://badge.fury.io/rb/jira_report.svg)](https://rubygems.org/gems/jira_report)
-[![Build Status](https://api.travis-ci.org/veelenga/jira_report.svg)](https://travis-ci.org/veelenga/jira_report)
-
-Jira Report
+Jira Report [![Gem Version](https://badge.fury.io/rb/jira_report.svg)](https://rubygems.org/gems/jira_report) [![Build Status](https://api.travis-ci.org/veelenga/jira_report.svg)](https://travis-ci.org/veelenga/jira_report)
 ===========================
 
-Queries user activities for specified period of time and prints it to console.
+Queries user activities from jira for specified period of time and prints it to console.
 
 ##Installation
 ```
-$gem install jira_report
+$ gem install jira_report
 ```
 
 ##Usage
-```sh
-$jira-report -h
-Usage: jira-report [options]
-    -u, --username username          Username to query activity report.
-    -c, --config config              Path to config file. USER_HOME/.jira-report is default.
-```
 
+Just run it. `jira-report` will ask you your jira location, who you are and what's your password:
 ```
-$jira-report -u admin
+$ jira-report
+Jira url: jira.company.com
+Jira username: admin
+Jira password:
 Querying jira...
+
 Jira activity report for [admin]:
 
 Created: 2
@@ -41,19 +37,55 @@ Resolved: 8
 Reopened: 0
 
 Closed: 5
-  TST-6943 - Remove redundant org.apache.log4j dependcy from common part
+  TST-6943 - Remove redundant org.apache.log4j dependency from common part
   TST-5862 - Unable to install NGinx on HP-UX with Java 6
   TST-5857 - Put back support for Jdk 1.6
   TST-5840 - NGinx fails to handle interaction initiated
   GSM-364 -  Migration of existing units
 ```
 
+`url`, `username`, `password` and some other parameters can be added to [configuration file](#configuration). Also you can use mixed approach (keep some options in file, others enter from command line). For example if you do not want to keep password in configuration file, just don't, you will be asked.
+
+Also you can use it directly in ruby:
+```ruby
+require 'jira_report'
+
+def print_issues(issues)
+  issues.each do |issue|
+    puts "  #{issue['key']} - #{issue['fields']['summary']}"
+  end
+end
+
+reporter = JiraReport::Reporter.new('jira.company.com', 'admin', 's3cr3t')
+# returns all created issues by 'my_jira_name'
+all_created = reporter.created('my_jira_name')
+
+# returns closed issues by 'admin' last week
+weekly_closed = reporter.closed('admin', '-1w')
+
+# returns reopened issues by 'usr' in period starting
+# from two weeks ago and ending one week ago.
+reopened = reporter.reopened('usr', '-2w', '-1w')
+
+print_issues(weekly_closed)
+```
+
 ##Configuration
-Default path to configuration file is `~/.jira-report`. All settings are optional and may be read from user input. See [sample](example/jira-report.sample).
+Path to configuration file can be specified by `-c` command line argument. `~/.jira-report` is default.
 
-Period is set by two options `period_from` and `period_till`. Both options support [advanced jira searching](https://confluence.atlassian.com/display/JIRA/Advanced+Searching) and accept dates, jira functions, aliasing. For example:
+There are three main options in config file to query jira:
+```
+url=jira.company.com
+username=username
+password=s3cr3t
+```
+all those are optional and if not specified user will be asked to enter it from command line.
 
+Period is set by two options `period_from` and `period_till`. Both options support [advanced jira searching](https://confluence.atlassian.com/display/JIRA/Advanced+Searching) and accept dates, jira functions, aliasing. For example:
 ```
-period_from=-3w
+period_from=-1w
 period_till=now()
 ```
+If those options not specified in configuration file, last week activities will be queried (just as in example above).
+
+You can look at configuration file [sample](example/jira-report.sample) in repository.

data/bin/jira-report

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'jira_report'
+require 'jira_report/cli'
 
-parameters = JiraReport::Cli.new
-settings = JiraReport::Settings.new(parameters.ini)
-JiraReport::JiraReport.new(settings, parameters.username).report
+JiraReport::Cli.new.run

data/jira_report.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'inifile', '~> 3.0'
+  spec.required_ruby_version = '>= 1.9.3'
+
+  spec.add_runtime_dependency 'parseconfig', '~> 1.0'
   spec.add_runtime_dependency 'rest-client', '~> 1.7'
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/jira_report.rb

@@ -1,97 +1 @@
-require 'rest_client'
-require 'json'
-require 'uri'
-
-require 'jira_report/settings'
-require 'jira_report/cli'
-
-module JiraReport
-  # Base class that generate jira activity report
-  class JiraReport
-    attr_accessor :from, :till, :username
-
-    def initialize(init_set, username)
-      @username = username ? username : init_set.username
-      @search_url = jira_search_url(init_set.url,
-                                    init_set.username,
-                                    init_set.password)
-
-      @from = init_set.period_from
-      @till = init_set.period_till
-    end
-
-    def report
-      puts "\nQuerying jira..."
-
-      begin
-        created = query(jql_created)
-        resolved = query(jql_resolved)
-        reopened = query(jql_reopened)
-        closed = query(jql_closed)
-
-        puts "\nJira activity report for [#{@username}]:"
-
-        puts "\nCreated: #{created.length}"
-        print_issues(created)
-
-        puts "\nResolved: #{resolved.length}"
-        print_issues(resolved)
-
-        puts "\nReopened: #{reopened.length}"
-        print_issues(reopened)
-
-        puts "\nClosed: #{closed.length}"
-        print_issues(closed)
-
-      rescue SocketError => e
-        puts "Unable to connect to jira: '#{e.message}'"
-      rescue Exception => e
-        puts "Unable to prepare activity report: '#{e.message}'"
-      end
-    end
-
-    private
-
-    def jira_search_url(url, username, password)
-      "http://#{username}:#{password}@#{url}/rest/api/2/search?"
-    end
-
-    def jql_created
-      "jql=created>=#{@from} "  \
-        "AND created<=#{@till} "\
-        "AND reporter=#{@username}"
-    end
-
-    def jql_resolved
-      "jql=resolved>=#{@from} "  \
-        "AND resolved<=#{@till} "\
-        "AND 'First Resolution User'=#{@username}"
-    end
-
-    def jql_closed
-      "jql='First Closed Date'>=#{@from} "  \
-        "AND 'First Closed Date'<=#{@till} "\
-        "AND 'First Closed User'=#{@username}"
-    end
-
-    def jql_reopened
-      "jql='First Reopened Date'>=#{@from} "  \
-        "AND 'First Reopened Date'<=#{@till} "\
-        "AND 'First Reopened User'=#{@username}"
-    end
-
-    def query(jql)
-      response = RestClient.get(@search_url + URI.escape(jql))
-      unless response.code == 200
-        fail "Got wrong response code: #{response.code}"
-      end
-      JSON.parse(response.body)['issues']
-    end
-
-    def print_issues(issues)
-      issues.each do |issue|
-        puts "  #{issue['key']} - #{issue['fields']['summary']}"
-      end
-    end
-  end
-end
+require 'jira_report/reporter'

data/lib/jira_report/cli.rb

@@ -1,31 +1,130 @@
-require 'optparse'
+require 'jira_report/options'
+require 'jira_report/config_loader'
+require 'jira_report/reporter'
 
 module JiraReport
-  # Prepares command line parameters using OptionParser
   class Cli
-    attr_reader :username, :ini
+    DEFAULT_CONFIG_PATH = '~/.jira-report'
 
     def initialize
-      options = parse
-      @username = options[:username]
-      @ini = options[:ini] ? options[:ini] : "~/.jira-report"
+      @config = {}
+    end
+
+    def run(args=ARGV)
+      begin
+        options = Options.new(args).options
+        act_on_option(options)
+
+        load_config(options[:config])
+        ask_missing_options
+        add_usr(options[:username])
+
+        report
+      rescue => e
+        puts "error: '#{e.message}'"
+        exit 1
+      rescue SystemExit => e
+        exit e.status
+      rescue Interrupt => e
+        puts 'Interrupted'
+        exit 130
+      rescue Exception => e
+        puts "fatal: '#{e.message}'"
+        exit 255
+      end
     end
 
     private
 
-    def parse
-      options = {}
-      OptionParser.new do |opts|
-        opts.banner = 'Usage: jira-report [options]'
-        opts.on('-u', '--username username', 'Username to query activity report.') do |u|
-          options[:username] = u
-        end
-        opts.on('-c', '--config config', 'Path to config file. ' \
-                'USER_HOME/.jira-report is default.') do |s|
-          options[:ini] = s
-        end
-      end.parse!
-      options
+    def report
+      reporter = Reporter.new(
+        @config[:url], @config[:username], @config[:password]
+      )
+
+      puts "\nQuerying jira..."
+
+      created = reporter.created(
+        @config[:usr], @config[:period_from], @config[:period_till]
+      )
+      resolved = reporter.resolved(
+        @config[:usr], @config[:period_from], @config[:period_till]
+      )
+      reopened = reporter.reopened(
+        @config[:usr], @config[:period_from], @config[:period_till]
+      )
+      closed = reporter.closed(
+        @config[:usr], @config[:period_from], @config[:period_till]
+      )
+
+      puts "\nJira activity report for [#{@config[:usr]}]:"
+
+      puts "\nCreated: #{created.length}"
+      print_issues(created)
+
+      puts "\nResolved: #{resolved.length}"
+      print_issues(resolved)
+
+      puts "\nReopened: #{reopened.length}"
+      print_issues(reopened)
+
+      puts "\nClosed: #{closed.length}"
+      print_issues(closed)
+    end
+
+    def print_issues(issues)
+      issues.each do |issue|
+        puts "  #{issue['key']} - #{issue['fields']['summary']}"
+      end
+    end
+
+    # Does required actions on specified option if needed.
+    def act_on_option(options)
+      if options.include? :version
+        puts VERSION
+        exit(0)
+      end
+      # ...
+    end
+
+    # Loads configuration from configuration file.
+    def load_config(path)
+      config_path = path ? path : DEFAULT_CONFIG_PATH
+      @config = ConfigLoader.load_config(config_path)
+    end
+
+    # Reads required options from user input if those
+    # were missed.
+    def ask_missing_options
+      @config[:url] = ask('Jira url: ') unless @config[:url]
+      @config[:username] = ask('Jira username: ') unless @config[:username]
+      @config[:password] = ask('Jira password: '){
+        STDIN.noecho(&:gets).chomp!
+      } unless @config[:password]
+      if !@config[:period_from] && !@config[:period_till]
+        @config[:period_from] = '-1w'
+        @config[:period_till] = 'now()'
+      end
+    end
+
+    # Asks user to enter something
+    def ask(message, &block)
+      print message
+      if block_given?
+        yield block
+      else
+        gets.chomp!
+      end
+    end
+
+    # Adds to config username to query about.
+    def add_usr(usr)
+      if usr
+        @config[:usr] = usr
+      else
+        # use username for authentication if username
+        # to query not specified.
+        @config[:usr] = @config[:username]
+      end
     end
   end
 end

data/lib/jira_report/config_loader.rb

@@ -0,0 +1,21 @@
+require 'parseconfig'
+
+module JiraReport
+  # Loads configuration from configuration file.
+  class ConfigLoader
+    def self.load_config(path)
+      begin
+        config = ParseConfig.new(File.expand_path(path))
+        symboled_hash(config.params)
+      rescue Exception => e
+        raise RuntimeError.new "Error loading config: #{e}"
+      end
+    end
+
+    private
+
+    def self.symboled_hash(h)
+      h.inject({}){ |m, (k,v)| m[k.to_sym] = v; m }
+    end
+  end
+end

data/lib/jira_report/options.rb

@@ -0,0 +1,78 @@
+require 'optparse'
+
+module JiraReport
+
+  # Collection of input argument descriptions.
+  class OptionsText
+    TEXT = {
+      username: 'Specify jira username to query statistic about.',
+      config:   'Specify path to configuration file.',
+      version:  'Display version.'
+    }
+  end
+
+  # Parses and validates array of input arguments.
+  class Options
+    # Accepts arguments to be parsed.
+    # Raises ArgumentError if args is not kind of Array.
+    def initialize(args)
+      unless args.kind_of? Array
+        raise ArgumentError.new "Array expected, but was #{args.class}"
+      end
+      @options = {}
+      parse(args)
+    end
+
+    # Returns clone of option hash
+    def options
+      @options.dup
+    end
+
+    # Returns option from option list with name that converted
+    # to symbol.
+    def get(sym)
+      @options[sym]
+    end
+
+    # Returns true if option list includes option which name
+    # converted to symbol.
+    def include?(sym)
+      @options.include? sym
+    end
+
+    private
+
+    # Parses args. Adds parsed argument to option hash
+    # in next format:
+    #   :option_name => option
+    # Where :option_name - corresponding symbol of
+    # option name.
+    def parse(args)
+      OptionParser.new do |opts|
+        opts.banner = 'Usage: jira-report [options]'
+
+        option(opts, '-u', '--username USERNAME')
+        option(opts, '-c', '--config FILE')
+        option(opts, '-v', '--version')
+      end.parse!(args)
+    end
+
+    # Adds new option.
+    def option(opts, *args)
+      opt_sym = long_opt_sym(*args)
+      args << OptionsText::TEXT[opt_sym]
+      opts.on(*args) { |arg| @options[opt_sym] = arg }
+    end
+
+    # Looks through arg list to find long option
+    # and converts it to sym. Assumes that long
+    # option always present.
+    #
+    # For example:
+    #  ['-c', '--config-file FILE'] => :config_file
+    def long_opt_sym(*args)
+      long_opt = args.find{ |arg| arg.start_with? '--' }
+      long_opt[2..-1].sub(/ .*/, '').gsub('-', '_').to_sym
+    end
+  end
+end

data/lib/jira_report/reporter.rb

@@ -0,0 +1,134 @@
+require 'rest_client'
+require 'json'
+require 'uri'
+
+module JiraReport
+  # With this class you can easily query user activities from jira
+  # in specified period of time.
+  #
+  # ==== Examples
+  #
+  #   reporter = Reporter.new('jira.company.url', 'admin', 's3cr3t')
+  #
+  #   # returns all created issues by 'my_jira_name'
+  #   all_created = reporter.created('my_jira_name')
+  #
+  #   # returns closed issues by 'admin' last week
+  #   weekly_closed = reporter.closed('admin', '-1w')
+  #
+  #   # returns reopened issues by 'usr' in period starting
+  #   # from two weeks ago and ending one week ago.
+  #   reopened = reporter.reopened('usr', '-2w', '-1w')
+  class Reporter
+    # Initializes reporter.
+    #
+    # ==== Attributes
+    #
+    # * +url+ - jira URL in `jira.company.com` format.
+    # * +usr+ - jira username.
+    # * +pass+ - jira password.
+    def initialize(url, usr, pass)
+      @search_url = jira_api_url(url, usr, pass);
+    end
+
+    # Queries created issues by usr in specified period.
+    #
+    # ==== Attributes
+    #
+    # * +usr+ - username query statistic about.
+    # * +from+ - period of time starts with this value (jql format).
+    # * +till+ - period of time ends with this value (jql format).
+    def created(usr, from=nil, till=nil)
+      query_issues(jql_created usr, from, till)
+    end
+
+    # Queries resolved issues by usr in specified period.
+    #
+    # ==== Attributes
+    #
+    # * +usr+ - username query statistic about.
+    # * +from+ - period of time starts with this value (jql format).
+    # * +till+ - period of time ends with this value (jql format).
+    def resolved(usr, from=nil, till=nil)
+      query_issues(jql_resolved usr, from, till)
+    end
+
+    # Queries reopened issues by usr in specified period.
+    #
+    # ==== Attributes
+    #
+    # * +usr+ - username query statistic about.
+    # * +from+ - period of time starts with this value (jql format).
+    # * +till+ - period of time ends with this value (jql format).
+    def reopened(usr, from=nil, till=nil)
+      query_issues(jql_reopened usr, from, till)
+    end
+
+    # Queries closed issues by usr in specified period.
+    #
+    # ==== Attributes
+    #
+    # * +usr+ - username query statistic about.
+    # * +from+ - period of time starts with this value (jql format).
+    # * +till+ - period of time ends with this value (jql format).
+    def closed(usr, from=nil, till=nil)
+      query_issues(jql_closed usr, from, till)
+    end
+
+    # Queries issues using jql query.
+    #
+    # ==== Attributes
+    #
+    # * +jql+ - query in jira query languages.
+    def query_issues(jql)
+      response = RestClient.get(@search_url + URI.escape(jql))
+      unless response.code == 200
+        fail "Response code: #{response.code}"
+      end
+      JSON.parse(response.body)['issues']
+    end
+
+    private
+
+    # Returns jira rest api search url.
+    def jira_api_url(url, username, password)
+      "http://#{username}:#{password}@#{url}/rest/api/2/search?"
+    end
+
+    # Prepares jql query based on parameters to
+    # search created issues.
+    def jql_created(usr, from, till)
+      jql = 'jql='
+      jql << "created>=#{from} AND " if from
+      jql << "created<=#{till} AND " if till
+      jql << "reporter=#{usr}"
+    end
+
+    # Prepares jql query based on parameters to
+    # search resolved issues.
+    def jql_resolved(usr, from, till)
+      jql = 'jql='
+      jql << "resolved>=#{from} AND " if from
+      jql << "resolved<=#{till} AND " if till
+      jql << "'First Resolution User'=#{usr}"
+    end
+
+    # Prepares jql query based on parameters to
+    # search reopened issues.
+    def jql_reopened(usr, from, till)
+      jql = 'jql='
+      jql << "'First Reopened Date'>=#{from} AND " if from
+      jql << "'First Reopened Date'<=#{till} AND " if till
+      jql << "'First Reopened User'=#{usr}"
+    end
+
+    # Prepares jql query based on parameters to
+    # search closed issues.
+    def jql_closed(usr, from, till)
+      jql = 'jql='
+      jql << "'First Closed Date'>=#{from} AND " if from
+      jql << "'First Closed Date'<=#{till} AND " if till
+      jql << "'First Closed User'=#{usr}"
+    end
+  end
+end

data/lib/jira_report/version.rb

@@ -1,3 +1,3 @@
 module JiraReport
-  VERSION = "0.0.2"
+  VERSION = "0.1.1"
 end

data/spec/jira_report/config_loader_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'jira_report/config_loader'
+
+module JiraReport
+  describe ConfigLoader do
+    it 'raises error if wrong path to configuration file' do
+      expect{ ConfigLoader.load_config('wrong/path') }.to raise_error RuntimeError
+    end
+
+    context 'when file exists' do
+      let(:filename){ 'test.conf' }
+      let(:option){ 'username' }
+      let(:value){ 'JohnDoe' }
+
+      before do
+        FileUtils.touch(filename)
+      end
+
+      def add_content(filename, content)
+        f = File.new(filename, 'a+')
+        f.write(content)
+        f.flush
+        f.close
+      end
+
+      after do
+        FileUtils.rm_r(filename)
+      end
+
+      it 'reads empty file correctly' do
+        config = ConfigLoader.load_config(filename)
+        expect(config).not_to be nil
+        expect(config).to be_empty
+      end
+
+      it 'read file with options' do
+        add_content(filename, "#{option}=#{value}")
+        config = ConfigLoader.load_config(filename)
+        expect(config).to include(option.to_sym => value)
+      end
+    end
+  end
+end

data/spec/jira_report/options_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+require 'jira_report/options'
+
+module JiraReport
+  describe Options do
+    def check_field(opts, s, v)
+      o = Options.new(opts)
+      expect(o.get(s)).to eq(v)
+      expect(o.options.include?(s)).to be true
+      expect(o.include?(s)).to be true
+    end
+
+    def check_flag(opts, s)
+      o = Options.new(opts)
+      expect(o.include?(s)).to be true
+    end
+
+    def check_field_err(opts, err=Exception)
+      expect{ Options.new(opts) }.to raise_error err
+    end
+
+    context 'when non-option passed' do
+      it 'should throw error if wrong option' do
+        check_field_err(['-1', 'value'], OptionParser::InvalidOption)
+      end
+      it 'should throw error if nil passed' do
+        check_field_err(nil, ArgumentError)
+      end
+    end
+
+    context 'when no arguments passed' do
+      let(:opt) { Options.new([]) }
+
+      it 'should have no options' do
+        expect(opt.options.empty?).to be true
+      end
+    end
+
+    describe '-h' do
+      before(:each) do
+        $stdout = StringIO.new
+        $stderr = StringIO.new
+      end
+      after(:each) do
+        $stdout = STDOUT
+        $stderr = STDERR
+      end
+
+      it 'exits clearly' do
+        expect{ Options.new(['-h']) }.to raise_error SystemExit
+        expect{ Options.new(['--help']) }.to raise_error SystemExit
+      end
+    end
+
+    describe '-v' do
+      it 'is accepted' do
+        check_flag(['-v'], :version)
+        check_flag(['--version'], :version)
+      end
+    end
+
+    describe '-u' do
+      it 'is accepted' do
+        usr = 'JohnDoe'
+        check_field(['-u', usr], :username, usr)
+        check_field(['--username', usr], :username, usr)
+      end
+      it 'is expected an error when argument not given' do
+        check_field_err(['-u'], OptionParser::MissingArgument)
+        check_field_err(['--username'], OptionParser::MissingArgument)
+      end
+    end
+
+    describe '-c' do
+      it 'is accepted' do
+        file = './test'
+        check_field(['-c', file], :config, file)
+        check_field(['--config', file], :config, file)
+      end
+      it 'is expected an error when argument not given' do
+        check_field_err(['-c'])
+        check_field_err(['--config'])
+      end
+    end
+  end
+end

data/spec/jira_report/reporter_spec.rb

@@ -0,0 +1,181 @@
+require 'spec_helper'
+
+module JiraReport
+  describe JiraReport do
+    let(:jrep) { Reporter.new('url', 'admin', '*****') }
+
+    describe '#query_issues' do
+      it 'should throw exception' do
+        begin
+          jrep.query_issues('my_jql')
+          fail Exception, 'exception expected'
+        rescue => e
+          expect(e.message).not_to be nil
+        end
+      end
+    end
+
+    describe '#jira_api_url' do
+      def jira_api_url(url=nil, user=nil, pass=nil)
+        jrep.send(:jira_api_url, url, user, pass)
+      end
+
+      it 'is an http url' do
+        url = jira_api_url
+        expect(url).not_to be nil
+        expect(url).to start_with 'http'
+      end
+
+      it 'uses rest api' do
+        expect(jira_api_url).to include('rest/api/2/search')
+      end
+
+      context 'when we use url, username and password' do
+        let(:usr) { 'admin_username' }
+        let(:url) { 'jira.mycompany.url' }
+        let(:pas) { '*****' }
+        it 'contains url, username and password' do
+          url = jira_api_url(url, usr, pas)
+          expect(url).to include(url)
+          expect(url).to include(usr)
+          expect(url).to include(pas)
+        end
+      end
+    end
+  end
+
+  describe '#queries' do
+    let(:usr) { 'JohnDoe' }
+    let(:from) { '-3w' }
+    let(:till) { '-1w' }
+
+    mocked_rep = Reporter.new('url', 'usr', 'pas')
+
+    before(:example) do
+      allow(mocked_rep).to receive(:query_issues) do |arg|
+        arg
+      end
+    end
+
+    describe '#created' do
+      it 'has from, till and reporter' do
+        expect(mocked_rep.created(usr, from, till)).to eql(
+          "jql=created>=#{from} AND created<=#{till} AND reporter=#{usr}"
+        )
+      end
+      it 'has from and reporter' do
+        expect(mocked_rep.created(usr, from)).to eql(
+          "jql=created>=#{from} AND reporter=#{usr}"
+        )
+      end
+      it 'has till and reporter' do
+        expect(mocked_rep.created(usr, nil, till)).to eql(
+          "jql=created<=#{till} AND reporter=#{usr}"
+        )
+      end
+      it 'has only reporter' do
+        expect(mocked_rep.created(usr)).to eql(
+          "jql=reporter=#{usr}"
+        )
+      end
+      it 'has not parameters' do
+        expect(mocked_rep.created(nil)).to eql(
+          "jql=reporter="
+        )
+      end
+    end
+
+    describe '#resolved' do
+      it 'has from, till and reporter' do
+        expect(mocked_rep.resolved(usr, from, till)).to eql(
+          "jql=resolved>=#{from} AND resolved<=#{till} AND 'First Resolution User'=#{usr}"
+        )
+      end
+      it 'has from and reporter' do
+        expect(mocked_rep.resolved(usr, from)).to eql(
+          "jql=resolved>=#{from} AND 'First Resolution User'=#{usr}"
+        )
+      end
+      it 'has till and reporter' do
+        expect(mocked_rep.resolved(usr, nil, till)).to eql(
+          "jql=resolved<=#{till} AND 'First Resolution User'=#{usr}"
+        )
+      end
+      it 'has only reporter' do
+        expect(mocked_rep.resolved(usr)).to eql(
+          "jql='First Resolution User'=#{usr}"
+        )
+      end
+      it 'has not parameters' do
+        expect(mocked_rep.resolved(nil)).to eql(
+          "jql='First Resolution User'="
+        )
+      end
+    end
+
+    describe '#reopened' do
+      it 'has from, till and reporter' do
+        expect(mocked_rep.reopened(usr, from, till)).to eql(
+          "jql='First Reopened Date'>=#{from} "\
+          "AND 'First Reopened Date'<=#{till} "\
+          "AND 'First Reopened User'=#{usr}"
+        )
+      end
+      it 'has from and reporter' do
+        expect(mocked_rep.reopened(usr, from)).to eql(
+          "jql='First Reopened Date'>=#{from} "\
+          "AND 'First Reopened User'=#{usr}"
+        )
+      end
+      it 'has till and reporter' do
+        expect(mocked_rep.reopened(usr, nil, till)).to eql(
+          "jql='First Reopened Date'<=#{till} "\
+          "AND 'First Reopened User'=#{usr}"
+        )
+      end
+      it 'has only reporter' do
+        expect(mocked_rep.reopened(usr)).to eql(
+          "jql='First Reopened User'=#{usr}"
+        )
+      end
+      it 'has not parameters' do
+        expect(mocked_rep.reopened(nil)).to eql(
+          "jql='First Reopened User'="
+        )
+      end
+    end
+
+    describe '#closed' do
+      it 'has from, till and reporter' do
+        expect(mocked_rep.closed(usr, from, till)).to eql(
+          "jql='First Closed Date'>=#{from} "\
+          "AND 'First Closed Date'<=#{till} "\
+          "AND 'First Closed User'=#{usr}"
+        )
+      end
+      it 'has from and reporter' do
+        expect(mocked_rep.closed(usr, from)).to eql(
+          "jql='First Closed Date'>=#{from} "\
+          "AND 'First Closed User'=#{usr}"
+        )
+      end
+      it 'has till and reporter' do
+        expect(mocked_rep.closed(usr, nil, till)).to eql(
+          "jql='First Closed Date'<=#{till} "\
+          "AND 'First Closed User'=#{usr}"
+        )
+      end
+      it 'has only reporter' do
+        expect(mocked_rep.closed(usr)).to eql(
+          "jql='First Closed User'=#{usr}"
+        )
+      end
+      it 'has not parameters' do
+        expect(mocked_rep.closed(nil)).to eql(
+          "jql='First Closed User'="
+        )
+      end
+    end
+  end
+
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jira_report
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Vitalii Elenhaupt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: inifile
+  name: parseconfig
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -99,9 +99,13 @@ files:
 - jira_report.gemspec
 - lib/jira_report.rb
 - lib/jira_report/cli.rb
-- lib/jira_report/settings.rb
+- lib/jira_report/config_loader.rb
+- lib/jira_report/options.rb
+- lib/jira_report/reporter.rb
 - lib/jira_report/version.rb
-- spec/jira_report_spec.rb
+- spec/jira_report/config_loader_spec.rb
+- spec/jira_report/options_spec.rb
+- spec/jira_report/reporter_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/veelenga/jira_report.git
 licenses:
@@ -115,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -128,6 +132,8 @@ signing_key:
 specification_version: 4
 summary: Jira activity report generator.
 test_files:
-- spec/jira_report_spec.rb
+- spec/jira_report/config_loader_spec.rb
+- spec/jira_report/options_spec.rb
+- spec/jira_report/reporter_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/jira_report/settings.rb

@@ -1,48 +0,0 @@
-require 'inifile'
-require 'io/console'
-
-# Initializes JiraReport settings.
-module JiraReport
-  class Settings
-    attr_reader :username, :password, :url,\
-      :period_from, :period_till
-
-    def initialize(path)
-      read(path)
-    end
-
-    private
-
-    def read(path)
-      loaded = IniFile.load(File.expand_path(path))
-
-      global = loaded[:global] if loaded
-      global ||= {}
-
-      @url = global['url']
-      @username = global['username']
-      @password = global['password']
-      @period_from = global['period_from']
-      @period_till = global['period_till']
-
-      @url = ask('Jira url in [jira.company.com] format: ') unless @url
-      @username = ask('Jira username: ') unless @username
-      @password = ask('Jira password: '){
-        STDIN.noecho(&:gets).chomp!
-      } unless @password
-      @period_from = '-1w' unless @period_from
-      @period_till = 'now()' unless @period_till
-
-      # TODO: attributes verification
-    end
-
-    def ask(message, &block)
-      print message
-      if block
-        yield block
-      else
-        gets.chomp!
-      end
-    end
-  end
-end

data/spec/jira_report_spec.rb

@@ -1,64 +0,0 @@
-require 'spec_helper'
-
-module JiraReport
-
-  class InitSet
-    attr_accessor :url,
-      :username, :password,
-      :period_from, :period_till
-  end
-
-  describe JiraReport do
-    let(:init) { InitSet.new }
-    let(:jrep) { JiraReport.new(init, 'username') }
-
-    describe '#jira_search_url' do
-      def jira_search_url(url=nil, user=nil, pass=nil)
-        jrep.send(:jira_search_url, url, user, pass)
-      end
-
-      it 'is an http url' do
-        url = jira_search_url
-        expect(url).not_to be nil
-        expect(url).to start_with 'http'
-      end
-
-      it 'uses rest api' do
-        expect(jira_search_url).to include('rest/api/2/search')
-      end
-
-      context 'when we use url and username' do
-        let(:usr) { 'admin_username' }
-        let(:url) { 'jira.mycompany.url' }
-        it 'contains url and username' do
-          url = jira_search_url(url, usr, nil)
-          expect(url).to include(url)
-          expect(url).to include(usr)
-        end
-      end
-
-      describe '#jql_*' do
-        describe '#jql_created' do
-          it 'returns query' do
-            expect(jrep.send(:jql_created)).not_to be nil
-          end
-        end
-        describe '#jql_resolved' do
-          it 'returns query' do
-            expect(jrep.send(:jql_resolved)).not_to be nil
-          end
-        end
-        describe '#jql_closed' do
-          it 'returns query' do
-            expect(jrep.send(:jql_closed)).not_to be nil
-          end
-        end
-        describe '#jql_reopened' do
-          it 'returns query' do
-            expect(jrep.send(:jql_reopened)).not_to be nil
-          end
-        end
-      end
-    end
-  end
-end