warder 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c517f0218b6da1d2e630821743464d8189b8ed3
-  data.tar.gz: 1fa74a10d1ccb85997aed8eccd0b13497cbc25eb
+  metadata.gz: 9a9860813b6cf0f11289b9a7272fac12d7151f39
+  data.tar.gz: 8362ff15175f9c7cccaa542daddc7ac38918a503
 SHA512:
-  metadata.gz: 09ecec2361551e410eefb61e6f3ef9de3a6d92f05e213830ac630769b6433204519fe7983f54243437b5a51acdfc61f30d470bd28a7bdb8a01c13b6c6510fc5e
-  data.tar.gz: 06b39ee496ee24ea2fe853de2201ed2ada89f18358db575cc825cfde24e9b8628b4b1106ca858c564fd09f1998e832077e3f9d6e95f5e223aa8a87cbd142a4b8
+  metadata.gz: 70fc86147b403485a2e1d01e6629670bdd1b84f59c19d1a27d8f2d4c847a8e25cf7a285f2715f3d5a418d8104e2b49fddca5c55a8c66e15b1b51e15151992b72
+  data.tar.gz: 5296b0b893355b53f03cd81f5e9c68bdc42b6c6fcf99e335ff5bbd353642eb6389fc8138245efa072d0ff7870d8490487266f794863a8ff3ec4334903d09521c

data/features/step_definitions/checks_for_rails_security_issues_steps.rb

@@ -19,5 +19,6 @@ Given(/^I have ((in)?valid_rails_app) project in directory$/) do |name, _|
 end
 
 Given(/^I am on project directory$/) do
-  @dirs = ["tmp/aruba/#{@projectname}"]
+  dir = Aruba::ArubaPath.new("tmp/aruba/#{@projectname}")
+  aruba.instance_variable_set('@current_directory', dir)
 end

data/features/step_definitions/run_steps.rb

@@ -18,10 +18,10 @@ Then(/^warder does nothing$/) do
 end
 
 Then(/^warder detects( no)? (.+) (issues|violations)$/) do |no, what, _|
-  executing_output = send(:"executing_#{what.gsub(' ', '_')}")
+  executing_output = send(:"executing_#{what.tr(' ', '_')}")
   step "the output should#{' not' if no} contain \"#{executing_output}\""
 
-  validation_output = send(:"#{what.gsub(' ', '_')}_output")
+  validation_output = send(:"#{what.tr(' ', '_')}_output")
   validation_output.split("\n").each do |string|
     step "the output should#{' not' if no} contain \"#{string}\""
   end

data/features/support/env.rb

@@ -17,5 +17,7 @@ ENV['PATH'] = "#{bin_path}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
 
 require 'warder'
 
-Aruba.process = Aruba::Processes::InProcess
-Aruba.process.main_class = Warder::CLI
+Aruba.configure do |config|
+  config.command_launcher = :in_process
+  config.main_class = Warder::CLI
+end

data/lib/warder.rb

@@ -11,7 +11,8 @@ require 'warder/rails_advice_runner'
 require 'warder/sandi_rules_runner'
 require 'warder/bundle_audit_runner'
 require 'warder/coffee_lint_runner'
-require 'warder/cli/arguments'
+require 'warder/aruba_app'
+require 'warder/arguments'
 require 'warder/cli'
 
 # scope for validators

data/lib/warder/arguments.rb

@@ -0,0 +1,104 @@
+require 'optparse'
+
+module Warder
+  # responsible for parsing cli arguments
+  class Arguments
+    def initialize(argv, stdout, kernel)
+      @argv = argv
+      @stdout = stdout
+      @kernel = kernel
+      @options = {}
+    end
+
+    def parse
+      parse_options
+      assign_files
+      OpenStruct.new(@options)
+    end
+
+    private
+
+    def parse_options
+      OptionParser.new do |opts|
+        quiet(opts)
+        stats(opts)
+        combined(opts)
+        validators(opts)
+      end.parse!(@argv)
+    end
+
+    def assign_files
+      @options['files'] = @argv.empty? ? '.' : @argv.join(' ')
+    end
+
+    def combined(opts)
+      version(opts)
+      opts.banner = 'Usage: warder [options] [dir1 file1 file2 ...]'
+      all(opts)
+      rails(opts)
+    end
+
+    def version(opts)
+      opts.on('-v', '--version', 'Show version') do |_|
+        @stdout.puts Warder::VERSION
+        @kernel.exit 0
+      end
+    end
+
+    def quiet(opts)
+      opts.on('-q', '--quiet', 'Do not echo validators output.') do
+        @options['quiet'] = true
+      end
+    end
+
+    def stats(opts)
+      opts.on('-t', '--[no-]stats', 'Print statistics.') do |value|
+        @options['stats'] = value
+      end
+    end
+
+    def all(opts)
+      opts.on('-A', '--all', 'Run all validators') do |value|
+        all_validators(value)
+      end
+    end
+
+    def all_validators(value)
+      Warder.validators.each do |validator|
+        full_option = validator::CLI_FULL_OPTION
+        @options[full_option] = value
+      end
+    end
+
+    def rails(opts)
+      desc = 'Run rails related validators'
+      opts.on('-R', '--[no-]rails', desc) do |value|
+        rails_validators(value)
+      end
+    end
+
+    def rails_validators(value)
+      Warder.validators.each do |validator|
+        next unless validator.to_s.match(/\AWarder::Rails/)
+        full_option = validator::CLI_FULL_OPTION
+        @options[full_option] = value
+      end
+    end
+
+    def validators(opts)
+      Warder.validators.each do |validator|
+        validator(opts, validator)
+      end
+    end
+
+    def validator(opts, validator)
+      option = validator::CLI_OPTION
+      full_option = validator::CLI_FULL_OPTION
+      desc = validator::DESCRIPTION
+
+      opts.on("-#{option}", "--[no-]#{full_option}", desc) do |value|
+        @options[full_option] = value
+      end
+    end
+  end
+end

data/lib/warder/aruba_app.rb

@@ -0,0 +1,20 @@
+module Warder
+  # responsible for aruba cli app test integration
+  class ArubaApp
+    def initialize(argv, stdin = STDIN, stdout = STDOUT,
+                   stderr = STDERR, kernel = Kernel)
+      @stdin = stdin
+      @stdout = stdout
+      @stderr = stderr
+      @kernel = kernel
+      argv
+    end
+
+    def execute!
+      @kernel.exit execute || 0
+    end
+
+    def execute
+    end
+  end
+end

data/lib/warder/cli.rb

@@ -1,38 +1,26 @@
 module Warder
   # responsible for cli integration
-  class CLI
+  class CLI < ArubaApp
     def initialize(argv, stdin = STDIN, stdout = STDOUT,
                    stderr = STDERR, kernel = Kernel)
+      super
       @argv = argv
-      @stdin = stdin
-      @stdout = stdout
-      @stderr = stderr
-      @kernel = kernel
-    end
-
-    def execute!
-      @kernel.exit execute
     end
 
     private
 
     def execute
-      parse_arguments
+      options = Arguments.new(@argv, @stdout, @kernel).parse
       exit_codes = Warder.validators.map do |validator|
-        perform_validation(validator)
+        perform_validation(validator, options)
       end
       exit_codes.compact.inject(0, :+)
     end
 
-    def parse_arguments
-      args = Arguments.new(@argv, @stdout, @kernel)
-      @options = args.parse
-    end
-
-    def perform_validation(validator)
+    def perform_validation(validator, options)
       key = validator::CLI_FULL_OPTION
-      return 0 unless @options.send(key)
-      runner = validator.new(@stdout, @options)
+      return 0 unless options.send(key)
+      runner = validator.new(@stdout, options)
       runner.perform
     end
   end

data/lib/warder/version.rb

@@ -1,4 +1,4 @@
 # defines warder version
 module Warder
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/fixtures/invalid_rails_app/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application

data/spec/fixtures/valid_rails_app/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.2.3'
+gem 'rails', '~> 4.2.5'
 
 gem 'sqlite3'

data/spec/fixtures/valid_rails_app/Gemfile_lock

@@ -1,92 +1,94 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
+    actionmailer (4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.3)
-      actionview (= 4.2.3)
-      activesupport (= 4.2.3)
+    actionpack (4.2.5)
+      actionview (= 4.2.5)
+      activesupport (= 4.2.5)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.3)
-      activesupport (= 4.2.3)
+    actionview (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.3)
-      activesupport (= 4.2.3)
+    activejob (4.2.5)
+      activesupport (= 4.2.5)
       globalid (>= 0.3.0)
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
       arel (~> 6.0)
-    activesupport (4.2.3)
+    activesupport (4.2.5)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.0)
+    arel (6.0.3)
     builder (3.2.2)
+    concurrent-ruby (1.0.0)
     erubis (2.7.0)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
     json (1.8.3)
-    loofah (2.0.2)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    minitest (5.8.3)
+    nokogiri (1.6.7)
+      mini_portile2 (~> 2.0.0.rc2)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.3)
-      actionmailer (= 4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
-      activemodel (= 4.2.3)
-      activerecord (= 4.2.3)
-      activesupport (= 4.2.3)
+    rails (4.2.5)
+      actionmailer (= 4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      activemodel (= 4.2.5)
+      activerecord (= 4.2.5)
+      activesupport (= 4.2.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.3)
+      railties (= 4.2.5)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.3)
-      actionpack (= 4.2.3)
-      activesupport (= 4.2.3)
+    railties (4.2.5)
+      actionpack (= 4.2.5)
+      activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    sprockets (3.2.0)
-      rack (~> 1.0)
-    sprockets-rails (2.3.2)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
@@ -96,8 +98,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rails (~> 4.2.3)
+  rails (~> 4.2.5)
   sqlite3
 
 BUNDLED WITH
-   1.10.4
+   1.10.6

data/spec/fixtures/valid_rails_app/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Rails.application

data/warder.gemspec

@@ -18,21 +18,21 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features|cucumber)\/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rubocop', '~> 0.32'
-  spec.add_dependency 'reek', '~> 3.0', '>= 3.0.3'
+  spec.add_dependency 'rubocop', '~> 0.35'
+  spec.add_dependency 'reek', '~> 3.7'
   spec.add_dependency 'flay', '~> 2.6', '>= 2.6.1'
   spec.add_dependency 'flog', '~> 4.3'
   spec.add_dependency 'mago', '~> 0.1'
-  spec.add_dependency 'brakeman', '~> 3.0'
+  spec.add_dependency 'brakeman', '~> 3.1'
   spec.add_dependency 'rails_best_practices', '~> 1.15'
   spec.add_dependency 'sandi_meter', '~> 1.2'
-  spec.add_dependency 'bundler-audit', '~> 0.3'
-  spec.add_dependency 'coffeelint', '~> 1.10'
+  spec.add_dependency 'bundler-audit', '~> 0.4'
+  spec.add_dependency 'coffeelint', '~> 1.14'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.3'
-  spec.add_development_dependency 'cucumber', '~> 2.0'
-  spec.add_development_dependency 'aruba', '~> 0.7'
-  spec.add_development_dependency 'simplecov', '~> 0.10'
+  spec.add_development_dependency 'rspec', '~> 3.4'
+  spec.add_development_dependency 'cucumber', '~> 2.1'
+  spec.add_development_dependency 'aruba', '~> 0.11'
+  spec.add_development_dependency 'simplecov', '~> 0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warder
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Yura Tolstik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,34 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '0.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.32'
+        version: '0.35'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: flay
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rails_best_practices
   requirement: !ruby/object:Gem::Requirement
@@ -140,28 +134,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: coffeelint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -196,56 +190,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 description: Warder of ruby code
 email:
 - yltsrc@gmail.com
@@ -293,9 +287,10 @@ files:
 - features/validates_coffeescript_style_guide.feature
 - features/validates_ruby_style_guide.feature
 - lib/warder.rb
+- lib/warder/arguments.rb
+- lib/warder/aruba_app.rb
 - lib/warder/bundle_audit_runner.rb
 - lib/warder/cli.rb
-- lib/warder/cli/arguments.rb
 - lib/warder/code_complexity_runner.rb
 - lib/warder/code_duplication_runner.rb
 - lib/warder/code_smell_runner.rb
@@ -388,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Tool to help improve the quality of ruby code

data/lib/warder/cli/arguments.rb

@@ -1,107 +0,0 @@
-require 'optparse'
-
-module Warder
-  # responsible for hiding arguments from global scope
-  class CLI
-    # responsible for parsing cli arguments
-    class Arguments
-      def initialize(argv, stdout, kernel)
-        @argv = argv
-        @stdout = stdout
-        @kernel = kernel
-        @options = {}
-      end
-
-      def parse
-        parse_options
-        assign_files
-        OpenStruct.new(@options)
-      end
-
-      private
-
-      def parse_options
-        OptionParser.new do |opts|
-          quiet(opts)
-          stats(opts)
-          combined(opts)
-          validators(opts)
-        end.parse!(@argv)
-      end
-
-      def assign_files
-        @options['files'] = @argv.empty? ? '.' : @argv.join(' ')
-      end
-
-      def combined(opts)
-        version(opts)
-        opts.banner = 'Usage: warder [options] [dir1 file1 file2 ...]'
-        all(opts)
-        rails(opts)
-      end
-
-      def version(opts)
-        opts.on('-v', '--version', 'Show version') do |_|
-          @stdout.puts Warder::VERSION
-          @kernel.exit 0
-        end
-      end
-
-      def quiet(opts)
-        opts.on('-q', '--quiet', 'Do not echo validators output.') do
-          @options['quiet'] = true
-        end
-      end
-
-      def stats(opts)
-        opts.on('-t', '--[no-]stats', 'Print statistics.') do |value|
-          @options['stats'] = value
-        end
-      end
-
-      def all(opts)
-        opts.on('-A', '--all', 'Run all validators') do |value|
-          all_validators(value)
-        end
-      end
-
-      def all_validators(value)
-        Warder.validators.each do |validator|
-          full_option = validator::CLI_FULL_OPTION
-          @options[full_option] = value
-        end
-      end
-
-      def rails(opts)
-        desc = 'Run rails related validators'
-        opts.on('-R', '--[no-]rails', desc) do |value|
-          rails_validators(value)
-        end
-      end
-
-      def rails_validators(value)
-        Warder.validators.each do |validator|
-          next unless validator.to_s.match(/\AWarder::Rails/)
-          full_option = validator::CLI_FULL_OPTION
-          @options[full_option] = value
-        end
-      end
-
-      def validators(opts)
-        Warder.validators.each do |validator|
-          validator(opts, validator)
-        end
-      end
-
-      def validator(opts, validator)
-        option = validator::CLI_OPTION
-        full_option = validator::CLI_FULL_OPTION
-        desc = validator::DESCRIPTION
-
-        opts.on("-#{option}", "--[no-]#{full_option}", desc) do |value|
-          @options[full_option] = value
-        end
-      end
-    end
-  end
-end