molflow 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 836aa8b9130202fe2c84adc752f2ed7503d66566
-  data.tar.gz: fe2c3afb559e992a6ab4474c4239ba1125e21c3a
+  metadata.gz: 3051535820c9d5ee3f7c8456b0fea1ffc361b399
+  data.tar.gz: f8530e2828227be2784d4e893292dd58753de3fc
 SHA512:
-  metadata.gz: 3619a381ae99524f3480662ab6aab6acec05a566df849cf6b5195466631a6747969710f9d93f983cf0bbec2bed1aa113f86d11ed5f3853aca29955dd28f65a55
-  data.tar.gz: 60a208a9157c01e7585fbf2a506a96930a77513b099bd3e925f083b46fdd9adcfbba5a4d235836fd0abe03eb76d6befde863629fd12da36c0b1fc39e7f0c27fe
+  metadata.gz: cf78541e7af95b9f4502600a7e35dff57dc26bee2cf7f0c02c76430d0426054a59b3b8ecd0b11b87cbc0e171286f6095f50d065e96a03502d544cd0a45e53c4a
+  data.tar.gz: db9b0483d061613ef308cc4ab2a840c2f0a5dd0f7523fe3949d43b09ec4735a311649a0e971fe8d5021ba96fcc9eb8a9ba34a206954fff0ad0a65fcc8d476b4f

data/Gemfile

@@ -3,5 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in molflow.gemspec
 gemspec
 
-gem 'jira-ruby', require: :jira
-gem 'pry'
+gem 'molflow', path: '../molflow'
+gem 'pry'
+
+group :test do
+  gem "rspec", "~> 3.1"
+end

data/bin/molflow

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "molflow"
+require 'molflow/cli'
 
-Molflow::Application.new.run
+Molflow::CLI.start

data/lib/molflow.rb

@@ -3,6 +3,7 @@ require 'rake'
 Rake.application.options.trace = true
 
 require 'molflow/application'
+require 'molflow/jira_client'
 require 'molflow/version'
 
 module Molflow

data/lib/molflow/cli.rb

@@ -0,0 +1,38 @@
+require 'thor'
+require 'pry'
+
+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'
+
+    def install
+      require 'molflow/cli/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/cli/install.rb

@@ -0,0 +1,30 @@
+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

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

data/lib/molflow/cli/jira_issues.rb

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,18 @@
+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/cli/task.rb

@@ -0,0 +1,15 @@
+module Molflow
+  class CLI < Thor
+    class Task
+      attr_reader :options
+
+      def self.run(options = {})
+        new(options).run
+      end
+
+      def initialize(options = {})
+        @options = options
+      end
+    end
+  end
+end

data/lib/molflow/jira.rb

@@ -1 +1,22 @@
-load File.expand_path(File.join(File.dirname(__FILE__),'tasks/jira.rake'))
+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/lib/molflow/version.rb

@@ -1,3 +1,3 @@
 module Molflow
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/molflow.gemspec

@@ -14,9 +14,12 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split($/)
 
   s.required_ruby_version     = '>= 1.9.3'
-  s.add_runtime_dependency 'rake', '~> 10.0', '>= 10.0.0'
+  s.add_dependency "thor", "~> 0.14"
   s.add_dependency 'jira-ruby','~> 0.1'
 
+  s.add_development_dependency "bundler", "~> 1.7"
+  s.add_development_dependency "rake", "~> 10.4"
+
   s.executables   = %w(molflow)
   s.require_paths = ["lib"]
 end

data/spec/spec_helper.rb

@@ -1,2 +1,4 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'molflow'
+require "bundler"
+Bundler.setup
+
+Bundler.require(:test)

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: molflow
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Dmitry Silaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: jira-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
 description: Workflow in Molinos
 email:
 - dmsilaev@yandex.ru
@@ -59,17 +81,16 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
 - bin/molflow
-- bin/setup
 - lib/Rakefile
 - lib/molflow.rb
-- lib/molflow/application.rb
-- lib/molflow/install.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/tasks/install.rake
-- lib/molflow/tasks/jira.rake
-- lib/molflow/templates/molflow.erb
 - lib/molflow/version.rb
 - molflow.gemspec
 - spec/molflow_spec.rb

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "molflow"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/lib/molflow/application.rb

@@ -1,18 +0,0 @@
-module Molflow
-  class Application < Rake::Application
-    def initialize
-      super
-      @rakefiles = %w{Capfile} << rakefile
-    end
-
-    def run
-      Rake.application = self
-      super
-    end
-
-    # allows the `cap install` task to load without a capfile
-    def rakefile
-      File.expand_path(File.join(File.dirname(__FILE__),'..','Rakefile'))
-    end
-  end
-end

data/lib/molflow/install.rb

@@ -1 +0,0 @@
-load File.expand_path(File.join(File.dirname(__FILE__),'tasks/install.rake'))

data/lib/molflow/tasks/install.rake

@@ -1,43 +0,0 @@
-require 'erb'
-require 'pathname'
-
-task :install do
-  home_dir = Pathname.new(ENV['HOME'])
-  molflow = File.expand_path("../../templates/molflow.erb", __FILE__)
-
-  entries = [{ template: molflow, file: home_dir.join('.molflow') }]
-
-  entries.each do |entry|
-    if File.exists?(entry[:file])
-      warn "[skip] #{entry[:file]} already exists"
-    else
-      File.open(entry[:file], 'w+') do |f|
-        f.write(ERB.new(File.read(entry[:template])).result(binding))
-      end
-    end
-  end
-end
-
-def site
-  STDOUT.puts "atlassian site:"
-  input = STDIN.gets.chomp
-  raise "enter address" if input == ''
-
-  input
-end
-
-def username
-  STDOUT.puts "atlassian username:"
-  input = STDIN.gets.chomp
-  raise "enter username" if input == ''
-
-  input
-end
-
-def password
-  STDOUT.puts "atlassian password:"
-  input = STDIN.gets.chomp
-  raise "enter password" if input == ''
-
-  input
-end

data/lib/molflow/tasks/jira.rake

@@ -1,40 +0,0 @@
-require 'jira'
-require 'yaml'
-
-namespace :jira do
-  molflow_config_file = Pathname.new(ENV['HOME']).join('.molflow')
-
-  if File.exist?(molflow_config_file)
-    molflow_config = YAML.load_file(molflow_config_file)
-
-    options = {
-            :username => molflow_config['username'],
-            :password => molflow_config['password'],
-            :site     => molflow_config['site'],
-            :auth_type => :basic,
-            :context_path => '',
-            :use_ssl => true
-          }
-
-    @client = JIRA::Client.new(options)
-  end
-
-  task :ps do
-    # Show all projects
-    @projects = @client.Project.all
-    @projects.each do |project|
-      puts "#{project.key} : #{project.name}"
-    end
-  end
-
-  task :is do
-    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
-

data/lib/molflow/templates/molflow.erb

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