archer-rails 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83355041e7d4db676c39d7578272e2ad5b1f485a1d3ce93f19c0ecf997afc270
-  data.tar.gz: 6dbafdf30bdd43a6866b25f137f3e9c23218d6f756b7f1e31a37f07cf321f5b2
+  metadata.gz: 7efb1ead011d342fecc5b05028013de7a07fd101bbda3610b67f11d2707b8e59
+  data.tar.gz: 26e4472b7a6e5402a4319fd148d4b921225b19cd4d47215a1f6e45b20d1300d1
 SHA512:
-  metadata.gz: 2b4638dcf53e8b2fc7883a992ae5a2234406298ebd7cb2a8d3a4eaf78e06fb81eb80cc7c892b7f8996c4785e7b60a55b702d85655587f4ee4989c7bff4f72f25
-  data.tar.gz: 4e2da0efaa2218f940ec22d62ef20d5f0747a1b5e63fe15189860306013cbb736440b96bec783d4774bdf5e5886218d908faaaeb60bf2ac5ae1be500a994456d
+  metadata.gz: 452c0c2b502e99e1d88694751ab538cab0134193ecff8de09ae27adc130cb37ab488162d48998c4e935165cf18c9c517298c7c33a04c89c4156a5ce997ac449e
+  data.tar.gz: 7adbb6348c77d01d5a3e9ddf5bd61ef4071e54f1a5b2018d7b877f67b04a05160025852408498a2fff6fa25d45cf4c38b4663135708fa517af9569844f9e0784

data/CHANGELOG.md

@@ -1,7 +1,12 @@
-## 0.1.1
+## 0.2.0 (2020-04-09)
+
+- Added support for Reline
+- Dropped support for Rails 4.2
+
+## 0.1.1 (2018-10-23)
 
 - Fixed issue with not loading history on Heroku
 
-## 0.1.0
+## 0.1.0 (2018-10-23)
 
 - First release

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Andrew Kane
+Copyright (c) 2018-2019 Andrew Kane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -59,6 +59,8 @@ Clear history for current user with:
 Archer.clear
 ```
 
+You should do this after running sensitive commands.
+
 ## Configuration
 
 Change the number of commands to remember
@@ -105,3 +107,11 @@ Everyone is encouraged to help improve this project. Here are a few ways you can
 - Fix bugs and [submit pull requests](https://github.com/ankane/archer/pulls)
 - Write, clarify, or fix documentation
 - Suggest or add new features
+
+To get started with development:
+
+```sh
+git clone https://github.com/ankane/archer.git
+cd archer
+bundle install
+```

data/lib/archer.rb

@@ -20,7 +20,8 @@ module Archer
     quietly do
       Archer::History.where(user: user).delete_all
     end
-    Readline::HISTORY.clear
+    Readline::HISTORY.clear if defined?(Readline)
+    Reline::HISTORY.clear if defined?(Reline)
     true
   end
 
@@ -35,20 +36,35 @@ module Archer
     end
 
     if history
-      Readline::HISTORY.push(*history.commands.split("\n"))
+      commands = history.commands.split("\n")
+      # can't use reline? yet, so push to all
+      Readline::HISTORY.push(*commands) if defined?(Readline)
+      Reline::HISTORY.push(*commands) if defined?(Reline)
     end
   end
 
   def self.save
     quietly do
       history = Archer::History.where(user: user).first_or_initialize
-      history.commands = Readline::HISTORY.to_a.last(limit).join("\n")
-      history.save
+      history.commands = history_object.to_a.last(limit).join("\n")
+      history.save!
     end
   rescue ActiveRecord::StatementInvalid
     warn "[archer] Unable to save history"
   end
 
+  # private
+  def self.history_object
+    reline? ? Reline::HISTORY : Readline::HISTORY
+  end
+
+  # private
+  def self.reline?
+    IRB.CurrentContext.io.is_a?(IRB::ReidlineInputMethod)
+  rescue
+    false
+  end
+
   # private
   def self.quietly
     ActiveRecord::Base.logger.silence do

data/lib/archer/version.rb

@@ -1,3 +1,3 @@
 module Archer
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/generators/archer/install_generator.rb

@@ -1,37 +1,17 @@
-# taken from https://github.com/collectiveidea/audited/blob/master/lib/generators/audited/install_generator.rb
-require "rails/generators"
-require "rails/generators/migration"
-require "active_record"
 require "rails/generators/active_record"
 
 module Archer
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      include Rails::Generators::Migration
-      source_root File.expand_path("../templates", __FILE__)
-
-      # Implement the required interface for Rails::Generators::Migration.
-      def self.next_migration_number(dirname) #:nodoc:
-        next_migration_number = current_migration_number(dirname) + 1
-        if ::ActiveRecord::Base.timestamped_migrations
-          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-        else
-          "%.3d" % next_migration_number
-        end
-      end
+      include ActiveRecord::Generators::Migration
+      source_root File.join(__dir__, "templates")
 
       def copy_migration
         migration_template "migration.rb", "db/migrate/create_archer_history.rb", migration_version: migration_version
       end
 
       def migration_version
-        if rails5?
-          "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
-        end
-      end
-
-      def rails5?
-        Rails::VERSION::MAJOR >= 5
+        "[#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}]"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archer-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2020-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,15 +94,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rails console history for Heroku, Docker, and more