molflow 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d933d87859721243c0de8100b2d5f59ac63147a9
-  data.tar.gz: 82652e0ef706ad3751c4365e4f4959f0adad1200
+  metadata.gz: ea5019f29cd9ff335ed1d4d8d30d868a7609fe35
+  data.tar.gz: 3ad23900634dd78b993b42d5504ddc729f9dac83
 SHA512:
-  metadata.gz: 3f7d8a2da38ed79e7fc268947487f9fa38013fc737d031241246e3fc63804f1f099e019f3d4c122320c0a8cb8b43cb269ca4ffec031e9cbbfc9a775095c78db5
-  data.tar.gz: 8d1afeb0f4518af6f13e092ae840c165d5876ce49d77b3a1d65ad735890ae57b6561112447704de5e5de136f1a55fe34872c4be91fd60ce310969f749325d174
+  metadata.gz: fbe6b51dc69912b2e6ce3f146da0006dfc47c2f4857aeef4a88329585d3d232b9f0a8f10d07eb00f1dd124b25827e30c248b5dd22e11dd2487a7cfe8cd000118
+  data.tar.gz: 32fbad506e3cc1f7ff04875a6c17a090c3a25399203a7ee367434920f3d8d947220de50fc223e3da30637fdf9b2e9a7316da43af846eee36ba44c4e001d657cc

data/.rubocop.yml

@@ -0,0 +1,35 @@
+Style/AsciiComments:
+  Enabled: false
+Metrics/LineLength:
+  Max: 120
+Documentation:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  SupportedStyles:
+    - nested
+    - compact
+SingleSpaceBeforeFirstArg:
+  Enabled: false
+
+AllCops:
+  Includes:
+    - Gemfile
+    - Rakefile
+  Excludes:
+    - bin/**
+    - vendor/**
+    - .bundle/**
+
+SymbolArray:
+  Enabled: true
+
+CollectionMethods:
+  PreferredMethods:
+    collect: 'map'
+    inject: 'reduce'
+    detect: 'find'
+    find_all: 'select'
+
+SpaceInsideHashLiteralBraces:
+  EnforcedStyleIsWithSpaces: false
+

data/Gemfile

@@ -5,7 +5,14 @@ gemspec
 
 gem 'molflow', path: '../molflow'
 gem 'pry'
+gem 'rest-client'
 
 group :test do
-  gem "rspec", "~> 3.1"
+  gem 'generator_spec'
+  gem 'guard-rspec', require: false
+  gem 'simplecov', require: false
+  gem 'simplecov-console', require: false
+  gem 'pry'
+  gem 'genspec', require: false
+  gem 'mocha'
 end

data/Guardfile

@@ -0,0 +1,22 @@
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
+  end
+end

data/README.md

@@ -9,12 +9,41 @@
 
 Затем нужно сконфигурировать
 
-    $ molflow install
+    $ molflow install [-p 'PATH']
+
+**Важно!**: Если выбран не стандартный путь `~/.molflow`, тогда нужно добавить в `~/.bashrc` или `~/.zshrc`
+следующую строчку:
+
+    export MOLFLOW_BASE_CONFIG = /custom/path/to/config/.file
 
 Адрес для atlassian molinos: https://molinos.atlassian.net
 
 
 ## Использование
 
-    $ molflow jira:ps
-    $ molflow jira:is
+    mf help [COMMAND]   # Describe available commands or one specific command
+    mf install          # molflow setup
+    mf jira help [COMMAND]    # Describe subcommands or one specific subcommand
+    mf jira jira i ISSUE_KEY  # show issue
+    mf jira jira is           # list issues
+    mf jira jira ps           # list projects
+
+## Планы
+
+
+    mf jira fs # list all filters
+               # ? надо с фильтрами разобраться, к каким есть доступ
+
+
+    mf jira i:start REN-215 # change status "to do" > "in progress"
+                            # --branch -b : 'git checkout master; git checkout -b REN-215'
+
+
+    mf jira i:verify REN-215 # change status "to do" > "in progress"
+                             # --commit -c [:message]     - 'git add . ; git commit -m "REN-215: Task name"' #TODO: description
+                             # --merge -m :branch         - 'git checkout :branch; git rebase REN-215'
+                             # --log -l :time             - logwork issue
+
+    mf jira i:delegate
+
+    mf init_project # configuration file in directory

data/bin/mf

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'molflow/cli'
+
+Molflow::CLI.start

data/lib/molflow.rb

@@ -1,11 +1,8 @@
 require 'rake'
 
-Rake.application.options.trace = true
-
-require 'molflow/application'
-require 'molflow/jira_client'
-require 'molflow/version'
-
 module Molflow
-  # Your code goes here...
+
+  def self.root
+    File.dirname __dir__
+  end
 end

data/lib/molflow/cli.rb

@@ -1,38 +1,19 @@
 require 'thor'
 require 'pry'
+require 'molflow/command_options'
+require 'molflow/commands/jira'
 
 module Molflow
   class CLI < Thor
-    # molflow install
-
-    desc 'install', 'Install Figaro'
-
-    method_option 'path',
-                  aliases: ['-p'],
-                  default: "#{ENV['HOME']}/.molflow",
-                  desc: 'Specify a configuration file path'
+    extend CommandOptions
+    register(Commands::Jira, 'jira', 'jira <resource>', 'show info jira resource')
 
+    # molflow install
+    method_option  'path', install_options('path')
+    desc 'install', 'molflow setup'
     def install
-      require 'molflow/cli/install'
+      require 'molflow/commands/install'
       Install.start
     end
-
-    # molflow jira:ps
-
-    desc 'jira:ps', 'The list of projects in jira'
-
-    define_method 'jira:ps' do
-      require 'molflow/cli/jira_projects'
-      JiraProjects.run(options)
-    end
-
-    # molflow jira:is
-
-    desc 'jira:is', 'The list of projects in jira'
-
-    define_method 'jira:is' do
-      require 'molflow/cli/jira_issues'
-      JiraIssues.run(options)
-    end
   end
 end

data/lib/molflow/command_options.rb

@@ -0,0 +1,55 @@
+module Molflow
+  module CommandOptions
+
+    # molflow install
+    def install_options(key)
+      case key
+      when 'path'
+        {
+          aliases: ['-p'],
+          type: :string,
+          default: "#{ENV['HOME']}/.molflow",
+          desc: 'Specify a configuration file path.'
+        }
+      end
+    end
+
+    def jira_options(key)
+      case key
+      when 'user'
+        {
+          aliases: ['-u'],
+          type: :string,
+          default: 'currentUser()',
+          desc: 'show user issues'
+        }
+      when 'project'
+        {
+          aliases: ['-p'],
+          type: :string,
+          desc: 'show project issues'
+        }
+      when 'status'
+        {
+          type: :string,
+          default: 'To Do,In Progress',
+          desc: 'status filter'
+        }
+      when 'order'
+        {
+          type: :string,
+          aliases: ['-o'],
+          default: 'updatedDate DESC',
+          desc: 'order issues'
+        }
+      when 'issue_key'
+        {
+          type: :string,
+          aliases: [''],
+          default: '',
+          desc: 'order issues'
+        }
+      end
+    end
+  end
+end

data/lib/molflow/commands/install.rb

@@ -0,0 +1,42 @@
+require 'thor/group'
+
+module Molflow
+  module Commands
+    # Class is used to customize the environment of the OS that will work with this gem.
+    # Default settings for all heme is written to the file ~/.molflow, or as --path parameter
+    class Install < Thor::Group
+      include Thor::Actions
+      extend CommandOptions
+
+      class_option  'path', install_options('path')
+
+      def self.source_root
+        File.expand_path('../install', __FILE__)
+      end
+
+      def init_variables
+        say('')
+        say('Enter your Atlassian credentials.')
+        @site     = ask('URL: ')
+        @username = ask('Username: ')
+        @password = ask('Password: ')
+        say('')
+      end
+
+      def copy_configuration
+        template('molflow', options[:path])
+        say('')
+      end
+
+      def enviroment_variable_warning
+        say("IMPORTANT!!! Add 'export MOLFLOW_BASE_CONFIG=#{options[:path]}' to you shell rc file(~/.bashrc or ~/.zshrc)", :yellow)
+        say('')
+      end
+
+      def complete
+        say('COMPLETE!', :green)
+        say('')
+      end
+    end
+  end
+end

data/lib/molflow/commands/install/molflow

@@ -0,0 +1,19 @@
+# atlassian options for client of jira-ruby gem: https://github.com/sumoheavy/jira-ruby/blob/master/lib/jira/client.rb
+atlassian:
+  site:     '<%= @site %>'
+  username: '<%= @username %>'
+  password: '<%= @password %>'
+  auth_type: :basic
+  context_path: ''
+  #signature_method:   'RSA-SHA1',
+  #request_token_path: '/plugins/servlet/oauth/request-token'
+  #authorize_path:     '/plugins/servlet/oauth/authorize'
+  #access_token_path:  '/plugins/servlet/oauth/access-token'
+  #private_key_file:   'rsakey.pem'
+  #rest_base_path:     '/rest/api/2'
+  #consumer_key:       nil
+  #consumer_secret:    nil
+  #ssl_verify_mode:    OpenSSL::SSL::VERIFY_PEER
+  #use_ssl:            true,
+  #proxy_address:      nil
+  #proxy_port:         nil

data/lib/molflow/commands/jira.rb

@@ -0,0 +1,37 @@
+require 'molflow/error'
+require 'molflow/commands/jira/projects'
+require 'molflow/commands/jira/issues'
+require 'molflow/commands/jira/client'
+require 'molflow/commands/jira/issue'
+require 'molflow/command_options'
+require 'thor'
+
+module Molflow
+  module Commands
+    class Jira < Thor
+      extend Client
+      extend CommandOptions
+
+      method_option  'path', install_options('path')
+      desc 'jira ps', 'list projects'
+      def ps
+        Projects.run
+      end
+
+      method_option  'user', jira_options('user')
+      method_option  'project', jira_options('project')
+      method_option  'status', jira_options('status')
+      method_option  'order', jira_options('order')
+      desc 'jira is', 'list issues'
+      def is
+        Issues.run(options)
+      end
+
+      method_option  'issue_key', jira_options('issue_key')
+      desc 'jira i ISSUE_KEY', 'show issue'
+      def i(issue_key)
+        Issue.run(options.merge issue_key: issue_key)
+      end
+    end
+  end
+end

data/lib/molflow/commands/jira/client.rb

@@ -0,0 +1,26 @@
+require 'jira'
+require 'yaml'
+
+module Molflow
+  module Commands
+    class Jira < Thor
+      module Client
+        def client
+          @client ||= JIRA::Client.new(atlassian_configuration)
+        end
+
+        def atlassian_configuration
+          @atlassian_configuration ||= base_config['atlassian'].symbolize_keys
+        end
+
+        def base_config
+          path = ENV['MOLFLOW_BASE_CONFIG'].present? ? ENV['MOLFLOW_BASE_CONFIG'] : "#{ENV['HOME']}/.molflow"
+
+          @base_config ||= YAML.load_file(path)
+        rescue
+          raise BaseConfigurationLoadError, path
+        end
+      end
+    end
+  end
+end

data/lib/molflow/commands/jira/issue.rb

@@ -0,0 +1,31 @@
+require "molflow/commands/jira"
+require "molflow/commands/task"
+
+module Molflow
+  module Commands
+    class Jira < Thor
+      class Issue < Task
+
+        def run
+          client = Jira.client
+          issue = client.Issue.find(options["issue_key"])
+
+          puts "#{issue.key} : #{issue.summary} : #{issue.status.name}"
+          puts "creator : #{issue.creator['name']}"
+          puts ""
+          puts issue.description
+        end
+
+        private
+
+        def actions
+
+        end
+      end
+
+      class Actions
+        include Thor::Actions
+      end
+    end
+  end
+end

data/lib/molflow/commands/jira/issues.rb

@@ -0,0 +1,32 @@
+require "molflow/commands/jira"
+require "molflow/commands/task"
+
+module Molflow
+  module Commands
+    class Jira < Thor
+      class Issues < Task
+        def run
+          client = Jira.client
+          jql = "assignee = #{options['user']}"
+          jql += " AND project = '#{options['project']}'" unless options["project"].nil?
+          if options['status'].present?
+            jql += ' AND ('
+            statuses = options['status'].split(',')
+            statuses.each do |status|
+              jql += " OR" if status != statuses.first
+              jql += " status = '#{status}'"
+            end
+            jql += ')'
+          end
+
+          jql += " ORDER BY #{options['order']}"
+          issues = client.Issue.jql(jql)
+
+          issues.each do |issue|
+            puts "#{issue.key} : #{issue.summary}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/molflow/commands/jira/projects.rb

@@ -0,0 +1,19 @@
+require "molflow/commands/jira"
+require "molflow/commands/task"
+
+module Molflow
+  module Commands
+    class Jira < Thor
+      class Projects < Task
+        def run
+          client = Jira.client
+          @projects = client.Project.all
+
+          @projects.each do |project|
+            puts("#{project.key} : #{project.name}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/molflow/{cli → commands}/task.rb

@@ -1,5 +1,5 @@
 module Molflow
-  class CLI < Thor
+  module Commands
     class Task
       attr_reader :options
 

data/lib/molflow/error.rb

@@ -0,0 +1,21 @@
+module Molflow
+  class Error < StandardError; end
+
+  class BaseConfigurationLoadError < LoadError
+    def initialize(path)
+      message = if File.exist?(path)
+                  "Sorry, but the configuration file has an incorrect format. Try `molflow install`.\nPath: #{path}"
+                else
+                  "Sorry, but the configuration file is missing on this path: #{path}. Try `molflow install`"
+                end
+
+      super(message)
+    end
+  end
+
+  class MissingKey < Error
+    def initialize(key)
+      super("Missing required configuration key: #{key.inspect}")
+    end
+  end
+end

data/lib/molflow/version.rb

@@ -1,3 +1,3 @@
 module Molflow
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/molflow

@@ -0,0 +1,19 @@
+# atlassian options for client of jira-ruby gem: https://github.com/sumoheavy/jira-ruby/blob/master/lib/jira/client.rb
+atlassian:
+  site:     'true'
+  username: 'true'
+  password: 'true'
+  auth_type: :basic
+  context_path: ''
+  #signature_method:   'RSA-SHA1',
+  #request_token_path: '/plugins/servlet/oauth/request-token'
+  #authorize_path:     '/plugins/servlet/oauth/authorize'
+  #access_token_path:  '/plugins/servlet/oauth/access-token'
+  #private_key_file:   'rsakey.pem'
+  #rest_base_path:     '/rest/api/2'
+  #consumer_key:       nil
+  #consumer_secret:    nil
+  #ssl_verify_mode:    OpenSSL::SSL::VERIFY_PEER
+  #use_ssl:            true,
+  #proxy_address:      nil
+  #proxy_port:         nil

data/molflow.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", "~> 1.7"
   s.add_development_dependency "rake", "~> 10.4"
 
-  s.executables   = %w(molflow)
+  s.executables   = %w(molflow mf)
   s.require_paths = ["lib"]
 end

data/spec/molflow/cli/install_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'molflow/commands/install'
+
+describe Molflow::Commands::Install do
+  subject(:install) { Molflow::Commands::Install }
+
+  it '#install: generate base configuration file' do
+    install.any_instance.stubs(:ask).returns(true)
+
+    path = "#{Molflow.root}/tmp/.molflow"
+    install.start(['-p', path].compact)
+
+    expect(File.exist?(path)).to be true
+  end
+end

data/spec/molflow/cli/jira_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+require 'molflow/cli/jira'
+
+describe Molflow::CLI::Jira do
+  subject(:jira) { Molflow::CLI::Jira }
+
+  it '#client: get jira client with base config' do
+    jira_client = jira.client
+    expect(jira_client.is_a?(JIRA::Client)).to be true
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,25 @@
-require "bundler"
+require 'molflow'
+
+require 'bundler'
 Bundler.setup
+Bundler.require(:test)
+
+require 'rspec/support/spec'
+require 'mocha/setup'
+
+if ENV['COVERAGE']
+  require 'simplecov'
+
+  SimpleCov.start do
+    add_filter '/spec/'
+    add_filter '/bin/'
+  end
+end
+
+RSpec.configure do |config|
+  config.mock_with :mocha
 
-Bundler.require(:test)
+  config.after(:all) do
+    FileUtils.rm_rf(Dir.glob("#{Molflow.root}/tmp"))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: molflow
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dmitry Silaev
@@ -71,29 +71,39 @@ email:
 - dmsilaev@yandex.ru
 executables:
 - molflow
+- mf
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/mf
 - bin/molflow
-- lib/Rakefile
 - lib/molflow.rb
 - lib/molflow/cli.rb
-- lib/molflow/cli/install.rb
-- lib/molflow/cli/install/molflow
-- lib/molflow/cli/jira_issues.rb
-- lib/molflow/cli/jira_projects.rb
-- lib/molflow/cli/task.rb
-- lib/molflow/jira.rb
+- lib/molflow/command_options.rb
+- lib/molflow/commands/install.rb
+- lib/molflow/commands/install/molflow
+- lib/molflow/commands/jira.rb
+- lib/molflow/commands/jira/client.rb
+- lib/molflow/commands/jira/issue.rb
+- lib/molflow/commands/jira/issues.rb
+- lib/molflow/commands/jira/projects.rb
+- lib/molflow/commands/task.rb
+- lib/molflow/error.rb
 - lib/molflow/version.rb
+- molflow
 - molflow.gemspec
-- spec/molflow_spec.rb
+- spec/molflow/cli/install_spec.rb
+- spec/molflow/cli/jira_spec.rb
+- spec/molflow/cli_spec.rb
 - spec/spec_helper.rb
 homepage: 
 licenses:

data/lib/Rakefile

@@ -1,2 +0,0 @@
-require 'molflow/install'
-require 'molflow/jira'

data/lib/molflow/cli/install.rb

@@ -1,30 +0,0 @@
-require 'thor/group'
-
-module Molflow
-  class CLI < Thor
-    class Install < Thor::Group
-      include Thor::Actions
-
-      class_option 'path',
-                    aliases: ['-p'],
-                    default: "#{ENV['HOME']}/.molflow",
-                    desc: 'Specify a configuration file path'
-
-      def self.source_root
-        File.expand_path('../install', __FILE__)
-      end
-
-      def create_configuration
-        @site = ask('Atlassian site: ')
-        @username = ask('Atlassian username: ')
-        @password = ask('Atlassian password: ')
-
-        template('molflow', options[:path])
-      end
-
-      def complete
-        say('COMPLETE!', :green)
-      end
-    end
-  end
-end

data/lib/molflow/cli/install/molflow

@@ -1,3 +0,0 @@
-site:     '<%= @site %>'
-username: '<%= @username %>'
-password: '<%= @password %>'

data/lib/molflow/cli/jira_issues.rb

@@ -1,20 +0,0 @@
-require 'molflow/jira'
-require 'molflow/cli/task'
-
-module Molflow
-  class CLI < Thor
-    class JiraIssues < Task
-
-      def run
-        client = Jira.client
-        jql = 'assignee = currentUser() AND (status = "To Do" OR status = "In Progress") AND (labels not in (Приостановлен) OR labels is EMPTY) ORDER BY updatedDate DESC'
-
-        issues = client.Issue.jql(jql)
-
-        issues.each do |issue|
-          puts "#{issue.key} : #{issue.summary}"
-        end
-      end
-    end
-  end
-end

data/lib/molflow/cli/jira_projects.rb

@@ -1,18 +0,0 @@
-require "molflow/jira"
-require "molflow/cli/task"
-
-module Molflow
-  class CLI < Thor
-    class JiraProjects < Task
-
-      def run
-        client = Jira.client
-        @projects = client.Project.all
-
-        @projects.each do |project|
-          puts("#{project.key} : #{project.name}")
-        end
-      end
-    end
-  end
-end

data/lib/molflow/jira.rb

@@ -1,22 +0,0 @@
-require 'jira'
-require 'yaml'
-
-module Molflow
-  class Jira
-    def self.client
-      config_path = "#{ENV['HOME']}/.molflow"
-      config_of_file = YAML.load_file(config_path)
-
-      options = {
-        username: config_of_file['username'],
-        password: config_of_file['password'],
-        site:     config_of_file['site'],
-        auth_type: :basic,
-        context_path: '',
-        use_ssl: true
-      }
-
-      JIRA::Client.new(options)
-    end
-  end
-end

data/spec/molflow_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe Molflow do
-  it 'has a version number' do
-    expect(Molflow::VERSION).not_to be nil
-  end
-
-  it 'does something useful' do
-    expect(false).to eq(true)
-  end
-end