console_utils 0.4.1.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1380c26eef04f62bc9906a37c1474345e76288c
-  data.tar.gz: daf25af3f2816e5e09085792acf9f45c9cfca548
+  metadata.gz: 3607787694af8ed4bc9e4466f95e9d090c312d22
+  data.tar.gz: fb4da9e048ac320e0aaa9d57fb919e90b2f505b2
 SHA512:
-  metadata.gz: c584be72495886bdb5d1cccbfaf6746e2e5d032c905fde9979b75189f9aced1cab4a1c51bb2ea606482bd4605b5d9608f83d463c7313fe63ce22234d1c46e328
-  data.tar.gz: 0b33ba83c797b0ccd130d51e60f92787d7ba85d2f50d4fabd5cccb33eeb729bba5829aef97a477c4a04b013b88404a69915de165e54f584f532ac47ac8ab9df2
+  metadata.gz: 2027cc176a4275fb61bec377d9dfc369bb51f736c84bb10f436da81c131ed0692896032a14802277b3c9f5af6119cbde468342cbf9864a4dc8bd3a6cc59e390c
+  data.tar.gz: 78be8092f07add77fca5eba1b95ff521af70f815c3818d76cc72b37da22ffb2bd95bf09ee4f3c974cbcfdd8312ffca77ce9aff7016b5ee9a9d797194eb67a60e

data/Appraisals

@@ -0,0 +1,5 @@
+appraise "rails42" do
+  gem "rails", "~> 4.2"
+  gem "sqlite3"
+  gem "pry-rails"
+end

data/Gemfile

@@ -1,8 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rails-console-utils.gemspec
-gemspec
-
-gem "rails", "~> 4.2"
-gem "pry"
-gem "rspec"
+gemspec

data/Rakefile

@@ -1,10 +1,33 @@
+require "rubygems"
+require "bundler/setup"
 require "bundler/gem_tasks"
-
+require "rake/testtask"
+require "appraisal"
 require 'rdoc/task'
 
+Rake::TestTask.new do |t|
+  t.libs.concat %w(console_utils spec)
+  t.pattern = "spec/*_spec.rb"
+end
+
+desc 'Start the Rails console'
+task :console => :development_env do
+  require 'rails/commands/console'
+  Rails::Console.start(Rails.application)
+end
+
+task :development_env do
+  ENV['RAILS_ENV'] = 'development'
+  require File.expand_path('../spec/config/environment', __FILE__)
+  Dir.chdir(Rails.application.root)
+end
+
 RDoc::Task.new do |rdoc|
   rdoc.main = "README.md"
   rdoc.rdoc_dir = "doc"
   rdoc.rdoc_files.include("README.md", "lib/**/*.rb")
   rdoc.options = ["--no-dcov", "--visibility=protected"]
-end
+end
+
+# Must invoke indirectly, using `rake appraisal`.
+task :default => [:test]

data/console_utils.gemspec

@@ -1,6 +1,8 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'console_utils/version'
 
 Gem::Specification.new do |spec|
@@ -14,16 +16,18 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/estum/console_utils"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.1"
 
   spec.add_dependency "activesupport", ">= 4.1", "< 5"
   spec.add_dependency "term-ansicolor"
   spec.add_dependency "awesome_print"
   spec.add_dependency "benchmark-ips"
+  spec.add_dependency "pry-rails"
   # spec.add_dependency 'sourcify', '~> 0.6.0.rc4'
 
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rdoc"
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "minitest"
 end

data/gemfiles/rails42.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2"
+gem "sqlite3"
+gem "pry-rails"
+
+gemspec :path => "../"

data/gemfiles/rails42.gemfile.lock

@@ -0,0 +1,137 @@
+PATH
+  remote: ../
+  specs:
+    console_utils (0.4.1.1)
+      activesupport (>= 4.1, < 5)
+      awesome_print
+      benchmark-ips
+      pry-rails
+      term-ansicolor
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.4)
+      actionview (= 4.2.4)
+      activesupport (= 4.2.4)
+      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.4)
+      activesupport (= 4.2.4)
+      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.4)
+      activesupport (= 4.2.4)
+      globalid (>= 0.3.0)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
+      builder (~> 3.1)
+    activerecord (4.2.4)
+      activemodel (= 4.2.4)
+      activesupport (= 4.2.4)
+      arel (~> 6.0)
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    appraisal (2.1.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (6.0.3)
+    awesome_print (1.6.1)
+    benchmark-ips (2.3.0)
+    builder (3.2.2)
+    coderay (1.1.0)
+    erubis (2.7.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
+    mime-types (2.6.2)
+    mini_portile (0.6.2)
+    minitest (5.8.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    pry (0.10.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-rails (0.3.4)
+      pry (>= 0.9.10)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.4)
+      actionmailer (= 4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      activemodel (= 4.2.4)
+      activerecord (= 4.2.4)
+      activesupport (= 4.2.4)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.4)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    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.4)
+      actionpack (= 4.2.4)
+      activesupport (= 4.2.4)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
+    rdoc (4.2.0)
+    slop (3.6.0)
+    sprockets (3.3.4)
+      rack (~> 1.0)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
+    term-ansicolor (1.3.2)
+      tins (~> 1.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tins (1.6.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  console_utils!
+  minitest
+  pry-rails
+  rails (~> 4.2)
+  rdoc
+  sqlite3
+
+BUNDLED WITH
+   1.10.6

data/lib/console_utils.rb

@@ -1,9 +1,9 @@
 require 'active_support'
 require 'active_support/core_ext'
+require 'active_support/tagged_logging'
 require 'term/ansicolor'
 require 'console_utils/core_ext/array_to_proc'
 require 'console_utils/core_ext/local_values'
-require 'console_utils/repl_context'
 require 'console_utils/version'
 
 begin
@@ -118,7 +118,7 @@ module ConsoleUtils
 
   # :attr:
   # Output logger (<tt>Logger.new(STDOUT)</tt> by default)
-  mattr_accessor(:logger) { Logger.new(STDOUT) }
+  mattr_accessor(:logger) { ActiveSupport::TaggedLogging.new(Logger.new(STDOUT)) }
 
   # :attr:
   # Enable the auth automator with the "exap"
@@ -145,17 +145,18 @@ module ConsoleUtils
     alias_method :config, :itself
 
     # :method: self.configure
-    def configure
+    def configure # :yields:
       yield(config)
     end
 
-    def enabled_modules
-      ConsoleUtils::MODULES - disabled_modules
-    end
+    def enabled_modules # :yields:
+      unless block_given?
+        return to_enum(__method__) { ConsoleUtils::MODULES.size - disabled_modules.dize }
+      end
 
-    # Yields each enabled module with a given block
-    def each_enabled_module
-      enabled_modules.each { |mod| yield const_get(mod) }
+      (ConsoleUtils::MODULES - disabled_modules).each do |mod|
+        yield(const_get(mod))
+      end
     end
 
     # Returns User's class set in the <tt>:user_class_name</tt>
@@ -189,40 +190,38 @@ module ConsoleUtils
       user.public_send(user_token_column)
     end
 
-    # Setup enabled modules for IRB context
-    def irb!
-      setup_modules_to(ReplContext.instance.irb!)
-    end
-
     # Setup enabled modules for Pry context
     def pry!
-      setup_modules_to(ReplContext.instance.pry!)
+      setup_modules_to { TOPLEVEL_BINDING.eval('self') }
     end
 
     # Setup enabled modules by extending given context
-    def setup_modules_to(context = nil)
-      context, block = block, context if !block_given? && context.respond_to?(:call)
-      context ||= yield if block_given?
+    def setup_modules_to # :yields:
+      logger.level = Logger::WARN
 
-      if context.nil?
-        warn "[ConsoleUtils] Trying to setup with empty context"
-        return
-      end
+      logger.tagged(name) do
+        unless block_given?
+          logger.warn { "Trying to setup with empty context" }
+          return
+        end
 
-      if ENV["CONSOLE_UTILS_DEBUG"] == "1"
-        logger.level = Logger::DEBUG
-        logger.debug { "Console instance: #{context.inspect} (#{ReplContext.instance.initialized_to})" }
-      else
-        logger.level = Logger::WARN
-      end
+        if ENV["CONSOLE_UTILS_DEBUG"] == "1"
+          logger.level = Logger::DEBUG
+          logger.debug { "Console instance: #{yield().inspect}" }
+        end
 
-      each_enabled_module { |mod| context.send(:extend, mod) }
+        enabled_modules do |mod|
+          logger.debug { "extending with #{mod.inspect}" }
+          yield().extend(mod)
+        end
+      end
     end
+
   end
 
   ActiveSupport.run_load_hooks(:console_utils, self)
 end
 
-if defined? Rails
+if defined?(Rails)
   require "console_utils/railtie"
 end

data/lib/console_utils/railtie.rb

@@ -3,14 +3,9 @@ require "rails/railtie"
 module ConsoleUtils
   ##
   # Console Utils Railtie
-  class Railtie < ::Rails::Railtie
-    #:nodoc: all
+  class Railtie < ::Rails::Railtie #:nodoc: all
     config.console_utils = ActiveSupport::OrderedOptions.new
 
-    # initializer 'console_utils.logger' do
-    #   ActiveSupport.on_load(:console_utils) { self.logger = ::Rails.logger }
-    # end
-
     initializer "console_utils.set_configs" do |app|
       options = app.config.console_utils
 
@@ -18,12 +13,12 @@ module ConsoleUtils
       options.disabled_modules << :ActiveRecordUtils unless defined?(ActiveRecord)
 
       ActiveSupport.on_load(:console_utils) do
-        options.each { |k,v| send(:"#{k}=", v) }
+        options.each { |k, v| public_send(:"#{k}=", v) }
       end
     end
 
-    console do |app|
-      ConsoleUtils.setup_modules_to(ReplContext.instance)
+    console do
+      ConsoleUtils.pry!
     end
   end
 end

data/lib/console_utils/version.rb

@@ -1,3 +1,3 @@
 module ConsoleUtils
-  VERSION = "0.4.1.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console_utils
 version: !ruby/object:Gem::Version
-  version: 0.4.1.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Anton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -73,35 +73,49 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,6 +138,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -132,6 +147,8 @@ files:
 - bin/console
 - bin/setup
 - console_utils.gemspec
+- gemfiles/rails42.gemfile
+- gemfiles/rails42.gemfile.lock
 - lib/awesome_print/proc.rb
 - lib/console_utils.rb
 - lib/console_utils/active_record_utils.rb
@@ -147,7 +164,6 @@ files:
 - lib/console_utils/other_utils.rb
 - lib/console_utils/pry.rb
 - lib/console_utils/railtie.rb
-- lib/console_utils/repl_context.rb
 - lib/console_utils/request_utils.rb
 - lib/console_utils/request_utils/auth_automators.rb
 - lib/console_utils/request_utils/exap.rb
@@ -167,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -180,4 +196,3 @@ signing_key:
 specification_version: 4
 summary: Groovy tools for Rails Console.
 test_files: []
-has_rdoc: 

data/lib/console_utils/repl_context.rb

@@ -1,50 +0,0 @@
-module ConsoleUtils
-  class ReplContext
-    include Singleton
-
-    def self.console
-      instance[]
-    end
-
-    def call
-      pry! || irb!
-    end
-
-    def irb!
-      init_to(:irb) { irb_rails! || ::IRB::ExtendCommandBundle }
-    end
-
-    def irb_rails!
-      init_to(:rails) { ::Rails.application.config.console::ExtendCommandBundle } if rails?
-    end
-
-    def pry!
-      init_to(:pry) { ::TOPLEVEL_BINDING.eval('self') } if pry?
-    end
-
-    def initialized_to
-      @initialized_to ||= []
-    end
-
-    def initialized?
-      initialized_to.size > 0
-    end
-
-    def rails?
-      defined? ::Rails::Application
-    end
-
-    def pry?
-      defined? ::Pry
-    end
-
-    private
-
-    def init_to(context)
-      unless initialized_to.include?(context)
-        initialized_to << context
-        yield if block_given?
-      end
-    end
-  end
-end