yacli 0.1.8 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDI1MTYxMTU4ZTVhOTU4MzE4MGY4ZGJhYjI2OGVmNWNlNmNhMGZmZQ==
+    YTZlNzk5YzU1Y2FiNDk5NzNkMjllMzkyNDE2NmYzYjY2NDhhZTQ1Yw==
   data.tar.gz: !binary |-
-    MzQwZDllOTljMDVhZmE3ZGEzZjk5MzIwZTIwYzA5YmQ3MjRmZDc4YQ==
+    ZjMwY2NhMWFmNmNkYTI4NDcxNTE4MTg3YWE0OWQ2OWUyZDJlNDMyMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDc4ODNmNjQ4NTlhZjk1NjQyMjU1Mjg1ZGFhZDJmMjhjODA4MzMxNDZmZjU5
-    YTQ3YzE2YTczNDczNjljOTJiYTU1MjIwOGQ5N2RlMDVlZTY4MjQwNTM3YTNj
-    MWQwYTExNGFkMTk3NTIwMTRlM2VhNGIxMTFkOTUwMDAxZWQ2OGE=
+    MjMxZDI4NGUwYWU5N2QxZDNkN2JlOTc1NmQ4NjUxMzU3MDZjNzQwMzZhZDE2
+    NmU4ODE3NDZmNmQ1ZWZjYzBlMTc3NDJlMGZlNGMzYzZjOGUyNzk3YzVkMzBl
+    MmQ0MzljZjEwMmIzN2JhYzZkYWY4YTUzOWRlMDA2ZWQ5ZTAxMTk=
   data.tar.gz: !binary |-
-    YmZlZjVjMTBmOGE5ZGNkMjQ3MjA4OWJlY2NlMDNlNDI5ZDg2YThmZmQ1ODgz
-    MjRiMDMwMGU1YWMyNTllMzQyMDllYWI1MjAwYjZmN2VkODhkZGI0MzhhNzFm
-    NjRhMTYxZTg5ZTYwNjFiMDA1YzM3ZjFmMWQ1YjNmZDRlM2M0OTg=
+    YzU0NGQzZWY1NThkMWFhMGI0YjZhZTI1YWRmM2NmYjM0YjZkZTNjNzQ5MTRh
+    MGU5M2I0M2Y0NmZiZWU1ZDFjZWMxMTBlYjQ5OWIzNjc5YTIxYzgwZDBhZDRm
+    MmMxNzk2NmVkZDY3NzcxNTkyMmNhNzlhMjA0OTkzOWMzMWNmODc=

data/.rubocop.yml

@@ -0,0 +1,38 @@
+Style/MutableConstant:
+  Enabled: false
+  
+Documentation:
+    Enabled: false
+
+Metrics/LineLength:
+  Max: 225
+  
+Metrics/MethodLength:
+  Max: 100
+
+Metrics/AbcSize:
+  Max: 50
+
+SpecialGlobalVars:
+  Enabled: false
+
+Style/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+  
+Style/TrailingCommaInLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+AllCops:
+  TargetRubyVersion: 2.2
+  UseCache: true
+  Include:
+    - '**/Gemfile*'
+    - '**/Rakefile*'
+    - '**/*.rake'
+    - '**/*.rb'
+  Exclude:
+    - 'gems/**/*'
+    - '**/*.lock'
+    - '**/gems/**/*'

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in yacli.gemspec
-gemspec
+gemspec

data/README.md

@@ -3,11 +3,12 @@ yacli
 [![Gem Version](http://img.shields.io/gem/v/yacli.svg)][gem]
 [![Build Status](http://img.shields.io/travis/rombob/yacli.svg)][travis]
 [![Coverage Status](https://img.shields.io/coveralls/rombob/yacli.svg)][coveralls]
+[![Codacy Badge](https://api.codacy.com/project/badge/grade/dc6b761f73aa423ba610746d19f8597c)][codacy]
 
 [gem]: https://rubygems.org/gems/yacli
 [travis]: http://travis-ci.org/rombob/yacli
 [coveralls]: https://coveralls.io/r/rombob/yacli
-
+[codacy]: https://www.codacy.com/app/github_50/yacli
 
 Prerequisites
 -------------

data/Rakefile

@@ -1,8 +1,19 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
 
-task :default => [:spec]
+task default: [:spec]
 desc 'run Rspec specs'
 task :spec do
   sh 'rspec spec'
 end
 
+desc 'Run Rspec spec with reports'
+task :spec_report do
+  sh 'rspec spec --format RspecJunitFormatter --out spec/reports/rspec.xml'
+end
+
+desc 'Run RuboCop on the lib directory'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.formatters = [%w(files offenses)]
+  task.fail_on_error = false
+end

data/bin/yacli

@@ -1,4 +1,18 @@
 #!/usr/bin/env ruby
+require 'bundler/setup'
 
+puts "INFO: Running using ruby version: #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 require 'yacli/cli'
-Yacli::Run.go
+begin
+  result = Yacli::Cli.start
+  puts "result: #{result}"
+rescue StandardError => e
+  puts "ERROR: #{e}"
+  puts "ERROR: #{e.backtrace.join("\n")}"
+
+  exit 1
+end
+
+exit result == 0 ? 0 : 1

data/lib/yacli/base.rb

@@ -1,21 +1,47 @@
 require 'logger'
 require 'socket'
+require 'open3'
+
+module ToBoolean
+  def to_bool
+    return true if self == true || to_s.strip =~ /^(true|yes|y|1)$/i
+    false
+  end
+end
+
+class NilClass; include ToBoolean; end
+class TrueClass; include ToBoolean; end
+class FalseClass; include ToBoolean; end
+class Numeric; include ToBoolean; end
+class String; include ToBoolean; end
 
 module Yacli
   class Base
     def init_logger(log_path = nil)
       output_file = log_path.nil? ? STDOUT : log_path
       logger = Logger.new(output_file)
-      logger.level = (!ENV['DEBUG'].nil?) ? Logger::DEBUG : Logger::INFO
+      logger.level = !ENV['DEBUG'].nil? ? Logger::DEBUG : Logger::INFO
       logger.debug "logger.level: #{logger.level}"
       logger
     end
-    
-    def error_exit(msg, exit_code = 1)
+
+    def initialize(opt = {})
+      @opt = opt
+      @log = init_logger
+      @log.debug "@opt: #{@opt.inspect}"
+    end
+
+    def error_exit(msg)
       @log.error msg
       raise ExecutionError
     end
-    
+
+    def init_opt(key, opt, default = '')
+      val = opt[key] || default
+      @log.debug "#{key}: #{val}"
+      val
+    end
+
     def pass_cli(cmd, valid_out_pattern = nil)
       cmd += ' 2>&1'
       @log.debug "running cmd: #{cmd}"
@@ -23,13 +49,50 @@ module Yacli
       success_exec = $?.success?
       @log.info "cmd_out: #{cmd_out}"
       @log.debug "success_exec: #{success_exec}"
-      
+
       valid_content = valid_out_pattern.nil? ? true : !cmd_out.match(/#{valid_out_pattern}/).nil?
       @log.debug "valid_content: #{valid_content}"
-      
-      raise InvalidExitCodeError.new(cmd_out) if !success_exec
-      raise InvalidContentError.new(cmd_out) if !valid_content
-      { :success => success_exec, :output => cmd_out }
+
+      raise InvalidExitCodeError, cmd_out unless success_exec
+      raise InvalidContentError, cmd_out unless valid_content
+      { success: success_exec, output: cmd_out }
+    end
+
+    def cli(opts = {})
+      cmd = init_opt(:cmd, opts, '')
+      valid_out_pattern = init_opt(:valid_out_pattern, opts, nil)
+      reverse_match = init_opt(:reverse_match, opts, false)
+      hide_output = init_opt(:hide_output, opts, false).to_bool
+      include_stderr = init_opt(:include_stderr, opts, true).to_bool
+      cmd += ' 2>&1' if include_stderr
+      @log.debug "running cmd: #{cmd}"
+
+      cmd_out = []
+      exit_code = nil
+      Open3.popen2(cmd) do |stdin, stdout, thread|
+        stdin.close
+        while line = stdout.gets
+          @log.info ">>> #{line.chomp}" unless hide_output
+          cmd_out << line.chomp
+        end
+
+        exit_code = thread.value
+      end
+      success_exec = exit_code.success?
+      cmd_out = cmd_out.join($INPUT_RECORD_SEPARATOR)
+      @log.debug "success_exec: #{success_exec.inspect}"
+      @log.debug "cmd_out: #{cmd_out.inspect}" unless hide_output
+
+      @log.debug "reverse_match: #{reverse_match.inspect}"
+      output_match = reverse_match ? cmd_out.match(/#{valid_out_pattern}/).nil? : !cmd_out.match(/#{valid_out_pattern}/).nil?
+      @log.debug "output_match: #{output_match.inspect}"
+      valid_content = valid_out_pattern.nil? ? true : output_match
+      @log.debug "valid_content: #{valid_content}"
+
+      raise InvalidExitCodeError, cmd_out unless success_exec
+      raise InvalidContentError, cmd_out unless valid_content
+      @log.debug "run result: #{{ success: success_exec, output: cmd_out }}"
+      exit_code
     end
   end
 end

data/lib/yacli/cli.rb

@@ -1,31 +1,18 @@
 require 'thor'
 
 module Yacli
-  class Run < Thor
-      
+  class Cli < Thor
     def self.common_opts
-      method_option :cmd, :aliases => "-r", :required => true
-      method_option :'config-path', :aliases => "-c", :required => false
-      method_option :'log-path', :aliases => "-l", :required => false
-      method_option :'dry-run', :aliases => "-d", :type => :boolean, :default => false
+      method_option :'dry-run', aliases: '-d', type: :boolean, default: false
     end
-    
-    desc "upload", "sync from local to s3"
-    common_opts
-    def upload
-      require 's3rsync/sync'
-      sync = Sync.new(options)
-      exit sync.run(:upload)
-    end
-    
-    desc "download", "sync from s3 to local"
+
+    desc 'cli', 'run cli'
     common_opts
-    def download
-      require 's3rsync/sync'
-      sync = Sync.new(options)
-      exit sync.run(:download)
+    method_option :cmd, aliases: '-c', default: 'uname'
+    def cli
+      require 'yacli/base'
+      b = Base.new
+      b.cli(options)
     end
-    
   end
-  
 end

data/lib/yacli/errors.rb

@@ -8,7 +8,7 @@ module Yacli
       end
     end
 
-    alias_method :message, :to_s
+    alias message to_s
   end
 
   class ExecutionError < YacliError; status_code(2); end

data/lib/yacli/run.rb

@@ -1,16 +1,15 @@
-require "yacli"
-require "json"
-require "erb"
+require 'yacli'
+require 'json'
+require 'erb'
 
 module Yacli
   class Run < Base
-  
     def initialize(opt = {})
       log_path = !opt['log-path'].nil? ? opt['log-path'] : nil
       @log = init_logger(log_path)
       @log.debug "opt: #{opt.inspect}"
     end
-  
+
     def go(cmd = 'uname -a')
       @log.debug "cmd: #{cmd}"
       output = pass_cli cmd

data/lib/yacli/version.rb

@@ -1,3 +1,3 @@
 module Yacli
-  VERSION = "0.1.8"
+  VERSION = '0.2.0'
 end

data/lib/yacli.rb

@@ -1,8 +1,7 @@
-require "yacli/version"
-require "yacli/base"
-require "yacli/run"
-require "yacli/errors"
+require 'yacli/version'
+require 'yacli/base'
+require 'yacli/run'
+require 'yacli/errors'
 
 module Yacli
-  
 end

data/spec/cli_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'yacli/run'
+
+include Helpers
+
+describe Yacli::Run do
+  context 'run is successfull' do
+    let(:opt) do
+      {
+        'cmd'     => 'date',
+        'dry-run' => false,
+      }
+    end
+    let(:output) { 'Success' }
+
+    before do
+      allow_any_instance_of(Yacli::Run).to receive(:pass_cli).and_return(nil)
+    end
+
+    it 'print date' do
+      cmd = 'date'
+      allow_any_instance_of(Yacli::Run).to receive(:pass_cli).with(cmd).and_return(output)
+      run = Yacli::Run.new(opt)
+      expect(run.go(cmd)).to eq output
+    end
+
+    # before do
+    #  allow_any_instance_of(clazz).to receive(opts[:method]).and_return(true)
+    #  Hecate::CLI.start
+    # end
+
+    # it "calls #{opts[:method]}" do
+    #  cli = Hecate::CLI.new
+    #  expect(cli.cli_cmd(class: opts[:class], method: opts[:method], opt: {})).to eq 0
+    # end
+  end
+end

data/spec/run_spec.rb

@@ -5,36 +5,23 @@ include Helpers
 
 describe Yacli::Run do
   context 'run is successfull' do
-    let(:opt) {
+    let(:opt) do
       {
-        'cmd'        => 'date',
-        'dry-run'     => false,
+        'cmd'     => 'date',
+        'dry-run' => false,
       }
-    }
+    end
     let(:output) { 'Success' }
-    
+
     before do
       allow_any_instance_of(Yacli::Run).to receive(:pass_cli).and_return(nil)
     end
-    
-    after do
-      #
-    end
-    
-    before(:each) do
-      #Helpers::pre_run_helper
-    end
-    
-    after(:each) do
-      # Nothing
-    end
-    
-    it "print date" do
-      cmd = "date"
+
+    it 'print date' do
+      cmd = 'date'
       allow_any_instance_of(Yacli::Run).to receive(:pass_cli).with(cmd).and_return(output)
       run = Yacli::Run.new(opt)
       expect(run.go(cmd)).to eq output
     end
-    
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
-require "simplecov"
-require "coveralls"
-require "yacli"
-require "yacli/base"
+require 'simplecov'
+require 'coveralls'
+require 'yacli'
+require 'yacli/base'
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
@@ -14,5 +14,4 @@ SimpleCov.start do
 end
 
 module Helpers
-  
 end

data/yacli.gemspec

@@ -20,13 +20,15 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "thor", "0.19.1"
   
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "rspec_junit_formatter", '0.2.3'
+  spec.add_development_dependency "simplecov", "0.10.0"
+  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rubocop", "0.40.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "bump"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "growl"
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
+  #spec.add_development_dependency "guard", "2.13.0"
+  #spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "coveralls"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yacli
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - rombob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -25,63 +25,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 0.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: bump
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.40.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: growl
+  name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -109,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: growl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -159,6 +159,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
 - .ruby-version
 - .travis.yml
 - Gemfile
@@ -173,6 +174,7 @@ files:
 - lib/yacli/errors.rb
 - lib/yacli/run.rb
 - lib/yacli/version.rb
+- spec/cli_spec.rb
 - spec/run_spec.rb
 - spec/spec_helper.rb
 - yacli.gemspec
@@ -201,5 +203,6 @@ signing_key:
 specification_version: 4
 summary: CLI wrapper library tool
 test_files:
+- spec/cli_spec.rb
 - spec/run_spec.rb
 - spec/spec_helper.rb