gemstash 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bab8ddab9daaae6c24fd9c878f367ca1206d275b1d42baacaa990cc5048d62d
-  data.tar.gz: '079b116b2cfb74f712a8300f46aa93d75867fbd4e8b74180595bda2ec3ee6c5b'
+  metadata.gz: 41416a39e4dabbc11e7f8f1ad812dc34ffce3fbfa47c6f997feec01c083bf483
+  data.tar.gz: c274c1eac63e99d2001f946b117c020dd1fe5c25bdcaf1c31dd28e0668603b2d
 SHA512:
-  metadata.gz: b9d4634083a17c6cca10725523aec385964b42755ade1c43334c7436acf275c3b66c265ed256b2006076b10ae643cd17862bd35be5f622239d9eacd0474180cd
-  data.tar.gz: 88fd7c8d2822fab3a50794453c1d7e1ea1e0014b6b80dbe3f15c05af9b4c078a54c16232c988cb3dbc0e3eb877e05177525daa75e8a9ee736e0e2e47ffc4986f
+  metadata.gz: 94941045dd2f8232b5c55a79e775df4e89243d62ce88f22bd737d9dda3bf718a9d30b184b790677beba415c98243b3190c362cab800333993e6d89677592d398
+  data.tar.gz: 3f771fae6b0a388dd730978ec0721c83514d3479fd30f9211def6d7bad2ce5f9a83239bbfde091b450f32c053d0f763799e61aa9a9f95b947802dc2c1533275a

data/CHANGELOG.md

@@ -1,3 +1,60 @@
+## 2.1.0 (2020-02-26)
+
+### Bugfixes
+
+  - Shebang should be the first thing in the file ([#222](https://github.com/rubygems/gemstash/pull/222), [@bronzdoc](https://github.com/bronzdoc))
+
+### Changes
+
+  - Update rack-test requirement from ~> 0.6 to ~> 1.1 ([#199](https://github.com/rubygems/gemstash/pull/199), [@dependabot](https://github.com/dependabot))
+  - Update rake requirement from ~> 10.0 to ~> 12.3 ([#200](https://github.com/rubygems/gemstash/pull/200), [@dependabot](https://github.com/dependabot))
+  - CI matrix: Drop 2.0, 2.1, 2.2 ([#201](https://github.com/rubygems/gemstash/pull/201), [@olleolleolle](https://github.com/olleolleolle))
+  - Update rubocop version and update files to be inline with new cops ([#202](https://github.com/rubygems/gemstash/pull/202), [@bronzdoc](https://github.com/bronzdoc))
+  - Update rubocop requirement from = 0.60.0 to = 0.61.0 ([#208](https://github.com/rubygems/gemstash/pull/208), [@dependabot](https://github.com/dependabot))
+  - Update rubocop requirement from = 0.61.0 to = 0.61.1 ([#209](https://github.com/rubygems/gemstash/pull/209), [@dependabot](https://github.com/dependabot))
+  - Avoid Rubocop warnings ([#210](https://github.com/rubygems/gemstash/pull/210), [@olleolleolle](https://github.com/olleolleolle))
+  - RSpec: config.disable_monkey_patching! ([#211](https://github.com/rubygems/gemstash/pull/211), [@olleolleolle](https://github.com/olleolleolle))
+  - Travis: update JRuby to 9.2.5.0 ([#212](https://github.com/rubygems/gemstash/pull/212), [@olleolleolle](https://github.com/olleolleolle))
+  - Update rubocop requirement from = 0.61.1 to = 0.62.0 ([#213](https://github.com/rubygems/gemstash/pull/213), [@dependabot](https://github.com/dependabot))
+  - Update rubocop requirement from = 0.62.0 to = 0.63.0 ([#215](https://github.com/rubygems/gemstash/pull/215), [@dependabot](https://github.com/dependabot))
+  - gemspec: Allow Bundler 2 ([#217](https://github.com/rubygems/gemstash/pull/217), [@olleolleolle](https://github.com/olleolleolle))
+  - Update rubocop requirement from = 0.63.0 to = 0.63.1 ([#218](https://github.com/rubygems/gemstash/pull/218), [@dependabot](https://github.com/dependabot))
+  - Update rubocop requirement from = 0.63.1 to = 0.64.0 ([#220](https://github.com/rubygems/gemstash/pull/220), [@dependabot](https://github.com/dependabot))
+  - CI: matrix updates - update JRuby, add 2.6.1 ([#221](https://github.com/rubygems/gemstash/pull/221), [@olleolleolle](https://github.com/olleolleolle))
+  - Add a failing Aruba-based RSpec test for the CLI client output ([#223](https://github.com/rubygems/gemstash/pull/223), [@olleolleolle](https://github.com/olleolleolle))
+  - Update rubocop requirement from = 0.64.0 to = 0.65.0 ([#224](https://github.com/rubygems/gemstash/pull/224), [@dependabot](https://github.com/dependabot))
+  - CI: use 2.5.5, 2.6.2 ([#225](https://github.com/rubygems/gemstash/pull/225), [@olleolleolle](https://github.com/olleolleolle))
+  - Update rubocop requirement from = 0.65.0 to = 0.66.0 ([#226](https://github.com/rubygems/gemstash/pull/226), [@dependabot](https://github.com/dependabot), [@olleolleolle](https://github.com/olleolleolle), [@bronzdoc](https://github.com/bronzdoc))
+  - CI: Use 2.4.6 ([#228](https://github.com/rubygems/gemstash/pull/228), [@olleolleolle](https://github.com/olleolleolle))
+  - Update rubocop requirement from = 0.66.0 to = 0.67.1 ([#229](https://github.com/rubygems/gemstash/pull/229), [@dependabot](https://github.com/dependabot), [@olleolleolle](https://github.com/olleolleolle))
+  - CI: Drop 2.3.8 ([#230](https://github.com/rubygems/gemstash/pull/230), [@olleolleolle](https://github.com/olleolleolle))
+  - Update rubocop requirement from = 0.67.1 to = 0.67.2 ([#231](https://github.com/rubygems/gemstash/pull/231), [@dependabot](https://github.com/dependabot))
+  - CI: Use JRuby 9.2.7.0 ([#232](https://github.com/rubygems/gemstash/pull/232), [@olleolleolle](https://github.com/olleolleolle))
+  - Update rubocop requirement from = 0.67.2 to = 0.68.0 ([#233](https://github.com/rubygems/gemstash/pull/233), [@dependabot](https://github.com/dependabot), [@olleolleolle](https://github.com/olleolleolle))
+  - Update rubocop requirement from = 0.68.1 to = 0.69.0 ([#234](https://github.com/rubygems/gemstash/pull/234), [@dependabot](https://github.com/dependabot))
+  - Update rubocop requirement from = 0.69.0 to = 0.70.0 ([#235](https://github.com/rubygems/gemstash/pull/235), [@dependabot](https://github.com/dependabot))
+  - Set Travis badge to /rubygems user ([#236](https://github.com/rubygems/gemstash/pull/236), [@olleolleolle](https://github.com/olleolleolle))
+  - Fix broken links ([#240](https://github.com/rubygems/gemstash/pull/240), [@Aliciawyse](https://github.com/Aliciawyse))
+  - Fix various rubocop/codeclimate issues ([#241](https://github.com/rubygems/gemstash/pull/241), [@tchia04](https://github.com/tchia04))
+  - Fix some broken links in readme ([#243](https://github.com/rubygems/gemstash/pull/243), [@Aliciawyse](https://github.com/Aliciawyse))
+  - Improve webspec tests ([#244](https://github.com/rubygems/gemstash/pull/244), [@Aliciawyse](https://github.com/Aliciawyse))
+  - CI: Use jruby-9.2.8.0 ([#245](https://github.com/rubygems/gemstash/pull/245), [@olleolleolle](https://github.com/olleolleolle))
+  - CI: Use ruby 2.4.7, 2.5.6, 2.6.4 ([#246](https://github.com/rubygems/gemstash/pull/246), [@olleolleolle](https://github.com/olleolleolle))
+  - Add puma server pidfile configuration option ([#248](https://github.com/rubygems/gemstash/pull/248), [@krists](https://github.com/krists))
+  - CI: Use jruby-9.2.9.0 ([#249](https://github.com/rubygems/gemstash/pull/249), [@olleolleolle](https://github.com/olleolleolle))
+  - Officially drop support for older rubies ([#250](https://github.com/rubygems/gemstash/pull/250), [@deivid-rodriguez](https://github.com/deivid-rodriguez))
+  - Add config to ignore Gemfile source ([#253](https://github.com/rubygems/gemstash/pull/253), [@zpdcodes](https://github.com/zpdcodes))
+  - Update Puma gem ([#255](https://github.com/rubygems/gemstash/pull/255), [@bronzdoc](https://github.com/bronzdoc))
+  - Spec failures might be due to a bundler version ([#256](https://github.com/rubygems/gemstash/pull/256), [@bronzdoc](https://github.com/bronzdoc))
+  - Update spec homepage ([#257](https://github.com/rubygems/gemstash/pull/257), [@bronzdoc](https://github.com/bronzdoc))
+  - Update README.md links ([#258](https://github.com/rubygems/gemstash/pull/258), [@bronzdoc](https://github.com/bronzdoc))
+  - Add PR template ([#259](https://github.com/rubygems/gemstash/pull/259), [@bronzdoc](https://github.com/bronzdoc))
+  - Update docs ([#260](https://github.com/rubygems/gemstash/pull/260), [@bronzdoc](https://github.com/bronzdoc))
+
+### Features
+
+  - Add configuration options cache_expiration, cache_max_size ([#207](https://github.com/rubygems/gemstash/pull/207), [@optix2000](https://github.com/optix2000), [@olleolleolle](https://github.com/olleolleolle))
+
 ## 2.0.0 (2018-11-18)
 
 ### Changes

data/exe/gemstash

@@ -1,3 +1,6 @@
 #!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
 require "gemstash/cli"
 Gemstash::CLI.start

data/lib/gemstash/api_key_authorization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 
 module Gemstash
@@ -19,6 +21,7 @@ module Gemstash
     def self.parse_authorization(request_env)
       http_auth = Rack::Auth::Basic::Request.new(request_env)
       return http_auth.credentials.first if http_auth.provided? && http_auth.basic?
+
       request_env["HTTP_AUTHORIZATION"]
     end
 

data/lib/gemstash/authorization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "set"
 
 module Gemstash
@@ -17,9 +19,7 @@ module Gemstash
 
       unless permissions == "all"
         permissions.each do |permission|
-          unless VALID_PERMISSIONS.include?(permission)
-            raise "Invalid permission '#{permission}'"
-          end
+          raise "Invalid permission '#{permission}'" unless VALID_PERMISSIONS.include?(permission)
         end
 
         permissions = permissions.join(",")
@@ -33,6 +33,7 @@ module Gemstash
     def self.remove(auth_key)
       record = Gemstash::DB::Authorization[auth_key: auth_key]
       return unless record
+
       record.destroy
       gemstash_env.cache.invalidate_authorization(auth_key)
       log.info "Authorization '#{auth_key}' with access to '#{record.permissions}' removed"
@@ -40,6 +41,7 @@ module Gemstash
 
     def self.check(auth_key, permission)
       raise NotAuthorizedError, "Authorization key required" if auth_key.to_s.strip.empty?
+
       auth = self[auth_key]
       raise NotAuthorizedError, "Authorization key is invalid" unless auth
       raise NotAuthorizedError, "Authorization key doesn't have #{permission} access" unless auth.can?(permission)
@@ -48,6 +50,7 @@ module Gemstash
     def self.[](auth_key)
       cached_auth = gemstash_env.cache.authorization(auth_key)
       return cached_auth if cached_auth
+
       record = Gemstash::DB::Authorization[auth_key: auth_key]
 
       if record
@@ -65,6 +68,7 @@ module Gemstash
 
     def can?(permission)
       raise "Invalid permission '#{permission}'" unless VALID_PERMISSIONS.include?(permission)
+
       all? || @permissions.include?(permission)
     end
 

data/lib/gemstash/cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "lru_redux"
 require "forwardable"
 
@@ -6,7 +8,7 @@ module Gemstash
   # for them. Under the hood is either a Memcached client via the dalli gem, or
   # an in memory client via the lru_redux gem.
   class Cache
-    EXPIRY = 30 * 60
+    EXPIRY = Env.current.config[:cache_expiration]
     extend Forwardable
     def_delegators :@client, :flush
 
@@ -47,7 +49,7 @@ module Gemstash
 
   # Wrapper around the lru_redux gem to behave like a dalli Memcached client.
   class LruReduxClient
-    MAX_SIZE = 500
+    MAX_SIZE = Env.current.config[:cache_max_size]
     EXPIRY = Gemstash::Cache::EXPIRY
     extend Forwardable
     def_delegators :@cache, :delete
@@ -68,6 +70,7 @@ module Gemstash
         # Atomic fetch... don't rely on nil meaning missing
         value = @cache.fetch(key) { found = false }
         next unless found
+
         yield(key, value)
       end
     end
@@ -76,4 +79,41 @@ module Gemstash
       @cache[key] = value
     end
   end
+
+  # Wrapper around the redis-rb gem to behave like a dalli Memcached client.
+  class RedisClient
+    extend Forwardable
+
+    def_delegator :@cache, :del, :delete
+
+    def initialize(redis_servers)
+      require "redis"
+      @cache = ::Redis.new(:url => redis_servers)
+    end
+
+    def alive!
+      @cache.ping == "PONG"
+    end
+
+    def get(key)
+      val = @cache.get(key)
+      YAML.load(val) unless val.nil?
+    end
+
+    def get_multi(keys)
+      @cache.mget(*keys).each do |k, v|
+        next if v.nil?
+
+        yield(k, YAML.load(v))
+      end
+    end
+
+    def set(key, value, expiry)
+      @cache.set(key, YAML.dump(value), :ex => expiry)
+    end
+
+    def flush
+      @cache.flushdb
+    end
+  end
 end

data/lib/gemstash/cli/authorize.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "securerandom"
 
@@ -28,13 +30,11 @@ module Gemstash
           raise Gemstash::CLI::Error.new(@cli, "To remove individual permissions, you do not need --remove
 Instead just authorize with the new set of permissions")
         end
-        Gemstash::Authorization.remove(auth_key(false))
+        Gemstash::Authorization.remove(auth_key(allow_generate: false))
       end
 
       def save_authorization
-        if @args.include?("all")
-          raise Gemstash::CLI::Error.new(@cli, "Don't specify permissions to authorize for all")
-        end
+        raise Gemstash::CLI::Error.new(@cli, "Don't specify permissions to authorize for all") if @args.include?("all")
 
         @args.each do |arg|
           unless Gemstash::Authorization::VALID_PERMISSIONS.include?(arg)
@@ -46,7 +46,7 @@ Instead just authorize with the new set of permissions")
         Gemstash::Authorization.authorize(auth_key, permissions)
       end
 
-      def auth_key(allow_generate = true)
+      def auth_key(allow_generate: true)
         if @cli.options[:key]
           @cli.options[:key]
         elsif allow_generate

data/lib/gemstash/cli/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 
 module Gemstash
@@ -38,13 +40,14 @@ module Gemstash
       def check_gemstash_version
         version = Gem::Version.new(Gemstash::Storage.metadata[:gemstash_version])
         return if Gem::Requirement.new("<= #{Gemstash::VERSION}").satisfied_by?(Gem::Version.new(version))
+
         raise Gemstash::CLI::Error.new(@cli, "Gemstash version #{Gemstash::VERSION} does not support version " \
                                              "#{version}.\nIt appears you may have downgraded Gemstash, please " \
                                              "install version #{version} or later.")
       end
 
       def pidfile_args
-        ["--pidfile", gemstash_env.base_file("puma.pid")]
+        ["--pidfile", gemstash_env.pidfile]
       end
     end
   end

data/lib/gemstash/cli/setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "fileutils"
 require "yaml"
@@ -44,11 +46,13 @@ module Gemstash
 
       def say_current_config(option, label)
         return if gemstash_env.config.default?(option)
+
         @cli.say "#{label}: #{gemstash_env.config[option]}"
       end
 
       def ask_with_default(prompt, options, default)
         raise "The options must all be lower case" if options.any? {|x| x.downcase != x }
+
         result = nil
         displayed_options = options.map {|x| x == default ? x.upcase : x }
         prompt = "#{prompt} [#{displayed_options.join(", ")}]"
@@ -72,8 +76,9 @@ module Gemstash
 
       def ask_cache
         say_current_config(:cache_type, "Current cache")
-        @config[:cache_type] = ask_with_default("Cache with what?", %w[memory memcached], "memory")
+        @config[:cache_type] = ask_with_default("Cache with what?", %w[memory memcached redis], "memory")
         ask_memcached_details if @config[:cache_type] == "memcached"
+        ask_redis_details if @config[:cache_type] == "redis"
       end
 
       def ask_memcached_details
@@ -83,6 +88,13 @@ module Gemstash
         @config[:memcached_servers] = servers
       end
 
+      def ask_redis_details
+        say_current_config(:redis_servers, "Current Redis servers")
+        servers = @cli.ask "What is the comma-separated list of Redis servers? [localhost:6379]"
+        servers = "localhost:6379" if servers.empty?
+        @config[:redis_servers] = servers
+      end
+
       def ask_database
         say_current_config(:db_adapter, "Current database adapter")
         @config[:db_adapter] = ask_with_default("What database adapter?", %w[sqlite3 postgres mysql mysql2], "sqlite3")
@@ -135,8 +147,10 @@ module Gemstash
             # we don't want to store metadata just yet
             metadata_file = gemstash_env.base_file("metadata.yml")
             break unless File.exist?(metadata_file)
+
             version = Gem::Version.new(YAML.load_file(metadata_file)[:gemstash_version])
             break if Gem::Requirement.new("<= #{Gemstash::VERSION}").satisfied_by?(Gem::Version.new(version))
+
             raise Gemstash::CLI::Error.new(@cli, "The base path already exists with a newer version of Gemstash")
           else
             @cli.say "Creating the file storage path '#{dir}'"
@@ -160,6 +174,7 @@ module Gemstash
 
       def say_error(title, error)
         return unless @cli.options[:debug]
+
         @cli.say @cli.set_color("#{title}: #{error}", :red)
 
         error.backtrace.each do |line|
@@ -174,10 +189,10 @@ module Gemstash
         gemstash_env.reset
       end
 
-      def try(thing)
+      def try(thing, &block)
         @cli.say "Checking that the #{thing} is available"
-        with_new_config { yield }
-      rescue => e
+        with_new_config(&block)
+      rescue StandardError => e
         say_error "Error checking #{thing}", e
         raise Gemstash::CLI::Error.new(@cli, "The #{thing} is not available")
       end

data/lib/gemstash/cli/start.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "puma/cli"
 
@@ -18,6 +20,7 @@ module Gemstash
 
       def setup_logging
         return unless daemonize?
+
         Gemstash::Logging.setup_logger(gemstash_env.log_file)
       end
 
@@ -30,7 +33,7 @@ module Gemstash
       end
 
       def puma_config
-        File.expand_path("../../puma.rb", __FILE__)
+        File.expand_path("../puma.rb", __dir__)
       end
 
       def args

data/lib/gemstash/cli/status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "puma/control_cli"
 

data/lib/gemstash/cli/stop.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "puma/control_cli"
 

data/lib/gemstash/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "thor"
 require "thor/error"

data/lib/gemstash/config.ru

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "puma/commonlogger"
 
 use Rack::Deflater
 use Gemstash::Logging::RackMiddleware
 
-if Gemstash::Env.daemonized?
-  use Puma::CommonLogger, Gemstash::Logging::StreamLogger.for_stdout
-end
+use Puma::CommonLogger, Gemstash::Logging::StreamLogger.for_stdout if Gemstash::Env.daemonized?
 
 use Gemstash::Env::RackMiddleware, Gemstash::Env.current
 use Gemstash::GemSource::RackMiddleware

data/lib/gemstash/configuration.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "yaml"
 require "erb"
 
 module Gemstash
-  #:nodoc:
+  # :nodoc:
   class Configuration
     DEFAULTS = {
       cache_type: "memory",
@@ -10,12 +12,15 @@ module Gemstash
       db_adapter: "sqlite3",
       bind: "tcp://0.0.0.0:9292",
       rubygems_url: "https://rubygems.org",
+      ignore_gemfile_source: false,
       protected_fetch: false,
       fetch_timeout: 20,
       # Actual default for db_connection_options is dynamic based on the adapter
       db_connection_options: {},
       puma_threads: 16,
-      puma_workers: 1
+      puma_workers: 1,
+      cache_expiration: 30 * 60,
+      cache_max_size: 500
     }.freeze
 
     DEFAULT_FILE = File.expand_path("~/.gemstash/config.yml").freeze
@@ -35,6 +40,7 @@ module Gemstash
       end
 
       raise MissingFileError, file if file && !File.exist?(file)
+
       file ||= default_file
 
       if File.exist?(file)

data/lib/gemstash/db/authorization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 
 module Gemstash

data/lib/gemstash/db/cached_rubygem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 
 module Gemstash
@@ -9,6 +11,7 @@ module Gemstash
           upstream_id = Gemstash::DB::Upstream.find_or_insert(upstream)
           record = self[upstream_id: upstream_id, name: gem_name.name, resource_type: resource_type.to_s]
           return record.id if record
+
           new(upstream_id: upstream_id, name: gem_name.name, resource_type: resource_type.to_s).tap(&:save).id
         end
       end

data/lib/gemstash/db/dependency.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 
 module Gemstash

data/lib/gemstash/db/rubygem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 
 module Gemstash
@@ -7,6 +9,7 @@ module Gemstash
       def self.find_or_insert(spec)
         record = self[name: spec.name]
         return record.id if record
+
         new(name: spec.name).tap(&:save).id
       end
     end

data/lib/gemstash/db/upstream.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gemstash
   module DB
     # Sequel model for upstreams table.
@@ -5,6 +7,7 @@ module Gemstash
       def self.find_or_insert(upstream)
         record = self[uri: upstream.to_s]
         return record.id if record
+
         new(uri: upstream.to_s, host_id: upstream.host_id).tap(&:save).id
       end
     end

data/lib/gemstash/db/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "gemstash"
 
 module Gemstash
@@ -52,6 +54,7 @@ module Gemstash
       def self.find_by_full_name(full_name)
         result = self[full_name: full_name]
         return result if result
+
         # Try again with the default platform, in case it is implied
         self[full_name: "#{full_name}-ruby"]
       end

data/lib/gemstash/db.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 require "gemstash"
 
 module Gemstash
   # Module containing the DB models.
   module DB
     raise "Gemstash::DB cannot be loaded until the Gemstash::Env is available" unless Gemstash::Env.available?
+
     Sequel::Model.db = Gemstash::Env.current.db
     Sequel::Model.raise_on_save_failure = true
     Sequel::Model.plugin :timestamps, update_on_create: true

data/lib/gemstash/dependencies.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require "cgi"
 require "set"
 
 module Gemstash
-  #:nodoc:
+  # :nodoc:
   class Dependencies
     def self.for_private
       new(scope: "private", db_model: Gemstash::DB::Dependency)
@@ -22,7 +24,7 @@ module Gemstash
       Fetcher.new(gems, @scope, @http_client, @db_model).fetch
     end
 
-    #:nodoc:
+    # :nodoc:
     class Fetcher
       include Gemstash::Env::Helper
       include Gemstash::Logging
@@ -59,6 +61,7 @@ module Gemstash
       def fetch_from_database
         return if done?
         return unless @db_model
+
         log.info "Querying dependencies: #{@gems.to_a.join(", ")}"
 
         @db_model.fetch(@gems) do |gem, value|
@@ -71,6 +74,7 @@ module Gemstash
       def fetch_from_web
         return if done?
         return unless @http_client
+
         log.info "Fetching dependencies: #{@gems.to_a.join(", ")}"
         gems_param = @gems.map {|gem| CGI.escape(gem) }.join(",")
         fetched = @http_client.get("api/v1/dependencies?gems=#{gems_param}")

data/lib/gemstash/env.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 require "gemstash"
 require "active_support/core_ext/file/atomic"
 require "dalli"
 require "fileutils"
 require "sequel"
 require "uri"
+require "pathname"
 
 module Gemstash
   # Storage for application-wide variables and configuration.
@@ -15,7 +18,7 @@ module Gemstash
 
     # Little module to provide easy access to the current Gemstash::Env.
     module Helper
-    private
+      private # rubocop:disable Layout/AccessModifierIndentation
 
       def gemstash_env
         Gemstash::Env.current
@@ -48,6 +51,7 @@ module Gemstash
 
     def self.current
       raise EnvNotSetError unless Thread.current[:gemstash_env]
+
       Thread.current[:gemstash_env]
     end
 
@@ -57,6 +61,7 @@ module Gemstash
 
     def self.daemonized?
       raise "Daemonized hasn't been set yet!" if @daemonized.nil?
+
       @daemonized
     end
 
@@ -105,12 +110,25 @@ module Gemstash
       end
     end
 
+    def pidfile
+      if config[:pidfile]
+        pathname = Pathname.new(config[:pidfile])
+        if pathname.relative?
+          base_file(pathname.to_s)
+        else
+          pathname.to_s
+        end
+      else
+        base_file("puma.pid")
+      end
+    end
+
     def atomic_write(file, &block)
       File.atomic_write(file, File.dirname(file), &block)
     end
 
     def rackup
-      File.expand_path("../config.ru", __FILE__)
+      File.expand_path("config.ru", __dir__)
     end
 
     def db
@@ -122,7 +140,7 @@ module Gemstash
           db = if RUBY_PLATFORM == "java"
             Sequel.connect("jdbc:sqlite:#{db_path}", config.database_connection_config)
           else
-            Sequel.connect("sqlite://#{URI.escape(db_path)}", config.database_connection_config)
+            Sequel.connect("sqlite://#{CGI.escape(db_path)}", config.database_connection_config)
           end
         when "postgres", "mysql", "mysql2"
           db = Sequel.connect(config[:db_url], config.database_connection_config)
@@ -137,7 +155,7 @@ module Gemstash
 
     def self.migrate(db)
       Sequel.extension :migration
-      migrations_dir = File.expand_path("../migrations", __FILE__)
+      migrations_dir = File.expand_path("migrations", __dir__)
       Sequel::Migrator.run(db, migrations_dir, :use_transactions => true)
     end
 
@@ -152,6 +170,8 @@ module Gemstash
           Gemstash::LruReduxClient.new
         when "memcached"
           Dalli::Client.new(config[:memcached_servers])
+        when "redis"
+          Gemstash::RedisClient.new(config[:redis_servers])
         else
           raise "Invalid cache client: '#{config[:cache_type]}'"
         end