canto 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeb06bfcc40fda1e93331d5dac392a3f973bbe2749c49afd2cb152bb04c84d4c
-  data.tar.gz: ef7433c9ab2e30ade5a8335b71b043eba4e3bb2f4155ad7548145d417e8ced5e
+  metadata.gz: b22df70bad61c5ef02d4686deb6f156dc9da82a81708776feefeb3937b18a57d
+  data.tar.gz: 3301bcce470c49c9518fb2dee686f226a9ea242be44a34560906c5792e2082af
 SHA512:
-  metadata.gz: 4b437b1ac8bbaa7b21188e2b7b8a0d9fca52bf37e7dd1df9fa5ebd978ad57d8ec3cea52f735301e4a25694279ebc39d7517b1fdfcc56fa27dfed802db7a5f228
-  data.tar.gz: a7f9e0538dcf34248fb48fed1a2d60f48951dd4f6017b6d313b8421f41c1048e417389cf05f0be3a54686d1e7379a16dc0bc0f890021d7a326cbab22562a931e
+  metadata.gz: 982d66bfce451a5a9336d2c1b2c3287e983463fb1208f7415a3280feecd056cbd48bcf2a2c0a3bbaf258b67098fbf45dcc4f80b223670e11c0d5a52400cd5a37
+  data.tar.gz: 3dbb6bac4b6063196d9a6a5b3ae836648ebc57b08d0e558f06d824dbaae77c4c2062ba8e24a4f5576da9ad438d977ba0cb4120c3af76e480b8c1bccb79a25c16

data/canto.gemspec

@@ -15,13 +15,8 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/merqloveu/canto'
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
+  spec.files = %w[canto.gemspec README.md CODE_OF_CONDUCT.md LICENSE.txt] + `git ls-files | grep -E '^(bin|lib)'`.split("\n")
 
-  spec.bindir = 'bin'
   spec.executables = ['canto']
   spec.require_paths = ['lib']
 end

data/lib/canto/cli.rb

@@ -1,6 +1,7 @@
 require 'singleton'
 require 'optparse'
 require 'fileutils'
+require 'logger'
 
 $stdout.sync = true
 
@@ -20,7 +21,7 @@ module Canto
       validate!
     end
 
-    def run(launcher, boot_app: true)
+    def run(boot_app: true)
       boot_application if boot_app
 
       self_read, self_write = IO.pipe
@@ -43,8 +44,8 @@ module Canto
           handle_signal(signal)
         end
       rescue Interrupt
-        Canto.logger.info 'Shutting down'
-        Canto.logger.info 'Bye!'
+        CLI.logger.info 'Shutting down'
+        CLI.logger.info 'Bye!'
 
         # Explicitly exit so busy Processor threads won't block process shutdown.
         #
@@ -62,24 +63,24 @@ module Canto
       # Heroku sends TERM and then waits 30 seconds for process to exit.
       'TERM' => ->(_) { raise Interrupt },
       'TSTP' => ->(_) {
-        Canto.logger.info 'Received TSTP, no longer accepting new work'
+        CLI.logger.info 'Received TSTP, no longer accepting new work'
       },
       'TTIN' => ->(_) {
         Thread.list.each do |thread|
-          Canto.logger.warn "Thread TID-#{(thread.object_id ^ ::Process.pid).to_s(36)} #{thread.name}"
+          CLI.logger.warn "Thread TID-#{(thread.object_id ^ ::Process.pid).to_s(36)} #{thread.name}"
           if thread.backtrace
-            Canto.logger.warn thread.backtrace.join("\n")
+            CLI.logger.warn thread.backtrace.join("\n")
           else
-            Canto.logger.warn '<no backtrace available>'
+            CLI.logger.warn '<no backtrace available>'
           end
         end
       }
     }
-    UNHANDLED_SIGNAL_HANDLER = ->(_) { Canto.logger.info 'No signal handler registered, ignoring' }
+    UNHANDLED_SIGNAL_HANDLER = ->(_) { CLI.logger.info 'No signal handler registered, ignoring' }
     SIGNAL_HANDLERS.default = UNHANDLED_SIGNAL_HANDLER
 
     def handle_signal(sig)
-      Canto.logger.debug "Got #{sig} signal"
+      CLI.logger.debug "Got #{sig} signal"
       SIGNAL_HANDLERS[sig].call(self)
     end
 
@@ -99,12 +100,14 @@ module Canto
       opts
     end
 
+    alias_method :die, :exit
+
     def set_environment(cli_env)
       @environment = cli_env || ENV['APP_ENV'] || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
     end
 
     def initialize_logger
-      Canto.logger = Logger.new($stdout, level: Logger::INFO)
+      CLI.logger = Logger.new($stdout, level: Logger::INFO)
     end
 
     def boot_application
@@ -116,11 +119,11 @@ module Canto
     def validate!
       if !File.exist?(options[:require]) ||
           (File.directory?(options[:require]) && !File.exist?("#{options[:require]}/config/application.rb"))
-        Canto.logger.info '=================================================================='
-        Canto.logger.info '  Please point Canto to Ruby file  '
-        Canto.logger.info '  to load your classes with -r [FILE].'
-        Canto.logger.info '=================================================================='
-        Canto.logger.info @parser
+        CLI.logger.info '=================================================================='
+        CLI.logger.info '  Please point Canto to Ruby file  '
+        CLI.logger.info '  to load your classes with -r [FILE].'
+        CLI.logger.info '=================================================================='
+        CLI.logger.info @parser
         die(1)
       end
     end
@@ -143,7 +146,7 @@ module Canto
 
       parser.banner = 'canto [options]'
       parser.on_tail '-h', '--help', 'Show help' do
-        Canto.logger.info parser
+        CLI.logger.info parser
         die 1
       end
 

data/lib/canto/version.rb

@@ -1,3 +1,3 @@
 module Canto
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canto
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Alexander Merkulov
@@ -19,16 +19,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".gitignore"
-- ".ruby-version"
-- ".standard.yml"
 - CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
 - bin/canto
 - canto.gemspec
 - lib/canto.rb

data/.circleci/config.yml

@@ -1,39 +0,0 @@
-version: 2.1
-orbs:
-  ruby: circleci/ruby@1.0.0
-
-jobs:
-  build:
-    docker:
-      - image: circleci/ruby:2.7.2
-
-    steps:
-      - checkout
-      - ruby/install-deps
-
-  minitest:
-    docker:
-      - image: circleci/ruby:2.7.2
-        environment:
-          BUNDLE_JOBS: 3
-          BUNDLE_RETRY: 3
-          BUNDLE_PATH: vendor/bundle
-
-    steps:
-      - checkout
-      - ruby/install-deps
-
-      - run:
-          name: Stale code fix
-          command: git fetch && git reset --hard origin/${CIRCLE_BRANCH}
-      - run:
-          name: Minitest
-          command: bundle exec rake test
-
-workflows:
-  tests:
-    jobs:
-      - build
-      - minitest:
-          requires:
-            - build

data/.gitignore

@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.gem

data/.ruby-version

@@ -1 +0,0 @@
-2.7.2

data/.standard.yml

@@ -1,22 +0,0 @@
-#fix: true               # default: false
-parallel: true           # default: false
-#format: progress        # default: Standard::Formatter
-#ruby_version: 2.3.3     # default: RUBY_VERSION
-#default_ignores: false  # default: true
-#
-ignore:
-  - './**/*':
-    - Style/RescueModifier
-    - Style/StringLiterals
-    - Style/StringLiteralsInInterpolation
-    - Lint/AssignmentInCondition
-    - Security/YAMLLoad
-    - Layout/SpaceInsideHashLiteralBraces
-    - Layout/ArgumentAlignment
-    - Standard/SemanticBlocks
-#  - 'db/schema.rb'
-#  - 'vendor/**/*'
-  - 'config/**/*'
-  - 'spec/**/*':
-    - Layout/EmptyLinesAroundBlockBody
-#      - Layout/AlignHash

data/Gemfile

@@ -1,7 +0,0 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in canto.gemspec
-gemspec
-
-gem "rake", "~> 12.0"
-gem "minitest", "~> 5.0"

data/Gemfile.lock

@@ -1,21 +0,0 @@
-PATH
-  remote: .
-  specs:
-    canto (0.1.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    minitest (5.14.3)
-    rake (12.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  canto!
-  minitest (~> 5.0)
-  rake (~> 12.0)
-
-BUNDLED WITH
-   2.1.4

data/Rakefile

@@ -1,10 +0,0 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task default: :test