gemstash 1.1.0 → 2.0.0

data/lib/gemstash/puma.rb

@@ -2,5 +2,5 @@ require "gemstash"
 
 threads 0, Gemstash::Env.current.config[:puma_threads].to_i
 bind Gemstash::Env.current.config[:bind].to_s
-workers 1
+workers Gemstash::Env.current.config[:puma_workers].to_i unless RUBY_PLATFORM == "java"
 rackup Gemstash::Env.current.rackup

data/lib/gemstash/storage.rb

@@ -117,6 +117,7 @@ module Gemstash
       digest = Digest::MD5.hexdigest(@name)
       child_folder = "#{safe_name}-#{digest}"
       @folder = File.join(@base_path, *trie_parents, child_folder)
+      @properties = nil
     end
 
     # When +key+ is nil, this will test if this resource exists with any

data/lib/gemstash/upstream.rb

@@ -11,9 +11,9 @@ module Gemstash
     def_delegators :@uri, :scheme, :host, :user, :password, :to_s
 
     def initialize(upstream, user_agent: nil)
-      @uri = URI(URI.decode(upstream.to_s))
+      @uri = URI(CGI.unescape(upstream.to_s))
       @user_agent = user_agent
-      raise "URL '#{@uri}' is not valid!" unless @uri.to_s =~ URI.regexp
+      raise "URL '#{@uri}' is not valid!" unless @uri.to_s =~ URI::DEFAULT_PARSER.make_regexp
     end
 
     def url(path = nil, params = nil)

data/lib/gemstash/version.rb

@@ -1,4 +1,4 @@
 #:nodoc:
 module Gemstash
-  VERSION = "1.1.0".freeze
+  VERSION = "2.0.0".freeze
 end

data/lib/gemstash/web.rb

@@ -26,6 +26,11 @@ module Gemstash
       body JSON.dump("error" => "Not found", "code" => 404)
     end
 
+    error GemPusher::ExistingVersionError do
+      status 422
+      body JSON.dump("error" => "Version already exists", "code" => 422)
+    end
+
     get "/" do
       @gem_source.serve_root
     end
@@ -46,10 +51,6 @@ module Gemstash
       @gem_source.serve_yank
     end
 
-    put "/api/v1/gems/unyank" do
-      @gem_source.serve_unyank
-    end
-
     post "/api/v1/add_spec.json" do
       @gem_source.serve_add_spec_json
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemstash
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Andre Arko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: server_health_check-rack
   requirement: !ruby/object:Gem::Requirement
@@ -120,42 +120,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.26'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.26'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -274,14 +280,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: '0.49'
 description: Gemstash acts as a local RubyGems server, caching copies of gems from
   RubyGems.org automatically, and eventually letting you push your own private gems
   as well.
@@ -325,42 +331,28 @@ files:
 - lib/gemstash/gem_source/private_source.rb
 - lib/gemstash/gem_source/rack_middleware.rb
 - lib/gemstash/gem_source/upstream_source.rb
-- lib/gemstash/gem_unyanker.rb
 - lib/gemstash/gem_yanker.rb
 - lib/gemstash/health.rb
 - lib/gemstash/http_client.rb
 - lib/gemstash/logging.rb
-- lib/gemstash/man/gemstash-authorize.1
 - lib/gemstash/man/gemstash-authorize.1.txt
-- lib/gemstash/man/gemstash-configuration.5
 - lib/gemstash/man/gemstash-configuration.5.txt
-- lib/gemstash/man/gemstash-customize.7
 - lib/gemstash/man/gemstash-customize.7.txt
-- lib/gemstash/man/gemstash-debugging.7
 - lib/gemstash/man/gemstash-debugging.7.txt
-- lib/gemstash/man/gemstash-deploy.7
 - lib/gemstash/man/gemstash-deploy.7.txt
-- lib/gemstash/man/gemstash-mirror.7
 - lib/gemstash/man/gemstash-mirror.7.txt
-- lib/gemstash/man/gemstash-multiple-sources.7
 - lib/gemstash/man/gemstash-multiple-sources.7.txt
-- lib/gemstash/man/gemstash-private-gems.7
 - lib/gemstash/man/gemstash-private-gems.7.txt
-- lib/gemstash/man/gemstash-readme.7
 - lib/gemstash/man/gemstash-readme.7.txt
-- lib/gemstash/man/gemstash-setup.1
 - lib/gemstash/man/gemstash-setup.1.txt
-- lib/gemstash/man/gemstash-start.1
 - lib/gemstash/man/gemstash-start.1.txt
-- lib/gemstash/man/gemstash-status.1
 - lib/gemstash/man/gemstash-status.1.txt
-- lib/gemstash/man/gemstash-stop.1
 - lib/gemstash/man/gemstash-stop.1.txt
-- lib/gemstash/man/gemstash-version.1
 - lib/gemstash/man/gemstash-version.1.txt
 - lib/gemstash/migrations/01_gem_dependencies.rb
 - lib/gemstash/migrations/02_authorizations.rb
 - lib/gemstash/migrations/03_cached_gems.rb
+- lib/gemstash/migrations/04_health_tests.rb
 - lib/gemstash/puma.rb
 - lib/gemstash/rack_env_rewriter.rb
 - lib/gemstash/specs_builder.rb
@@ -388,7 +380,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A place to stash gems you'll need

data/lib/gemstash/gem_unyanker.rb

@@ -1,67 +0,0 @@
-require "gemstash"
-
-module Gemstash
-  # Class that supports unyanking a gem from the private repository of gems.
-  class GemUnyanker
-    include Gemstash::Env::Helper
-
-    # This error is thrown when unyanking a non-existing gem name.
-    class UnknownGemError < StandardError
-    end
-
-    # This error is thrown when unyanking a non-existing gem version.
-    class UnknownVersionError < StandardError
-    end
-
-    # This error is thrown when unyanking a non-yanked gem version.
-    class NotYankedVersionError < StandardError
-    end
-
-    def self.serve(app)
-      gem_name = app.params[:gem_name]
-      slug = Gemstash::DB::Version.slug(app.params)
-      new(app.auth, gem_name, slug).serve
-    end
-
-    def initialize(auth, gem_name, slug)
-      @auth = auth
-      @gem_name = gem_name
-      @slug = slug
-    end
-
-    def serve
-      check_auth
-      update_database
-      invalidate_cache
-    end
-
-  private
-
-    def storage
-      @storage ||= Gemstash::Storage.for("private").for("gems")
-    end
-
-    def full_name
-      @full_name ||= "#{@gem_name}-#{@slug}"
-    end
-
-    def check_auth
-      @auth.check("unyank")
-    end
-
-    def update_database
-      gemstash_env.db.transaction do
-        raise UnknownGemError, "Cannot unyank an unknown gem!" unless Gemstash::DB::Rubygem[name: @gem_name]
-        version = Gemstash::DB::Version.find_by_full_name(full_name)
-        raise UnknownVersionError, "Cannot unyank an unknown version!" unless version
-        raise NotYankedVersionError, "Cannot unyank a non-yanked version!" if version.indexed
-        version.reindex
-        storage.resource(version.storage_id).update_properties(indexed: true)
-      end
-    end
-
-    def invalidate_cache
-      gemstash_env.cache.invalidate_gem("private", @gem_name)
-    end
-  end
-end

data/lib/gemstash/man/gemstash-authorize.1

@@ -1,51 +0,0 @@
-.\" Automatically generated by Pandoc 1.19.2.1
-.\"
-.TH "gemstash\-authorize" "1" "October 9, 2015" "" ""
-.hy
-.SH NAME
-.PP
-gemstash\-authorize \- Adds or removes authorization to interact with
-privately stored gems
-.SH SYNOPSIS
-.PP
-\f[C]gemstash\ authorize\ [permissions]\ [\-\-remove]\ [\-\-key\ SECURE_KEY]\ [\-\-config\-file\ FILE]\f[]
-.SH DESCRIPTION
-.PP
-Adds or removes authorization to interact with privately stored gems.
-.PP
-Any arguments will be used as specific permissions.
-Valid permissions include \f[C]push\f[], \f[C]yank\f[], \f[C]unyank\f[],
-and \f[C]fetch\f[].
-If no permissions are provided, then all permissions will be granted
-(including any that may be added in future versions of Gemstash).
-.SS USAGE
-.IP
-.nf
-\f[C]
-gemstash\ authorize
-gemstash\ authorize\ push\ yank
-gemstash\ authorize\ yank\ unyank\ \-\-key\ <secure\-key>
-gemstash\ authorize\ \-\-remove\ \-\-key\ <secure\-key>
-\f[]
-.fi
-.SH OPTIONS
-.IP \[bu] 2
-\f[C]\-\-config\-file\ FILE\f[]: Specify the config file to use.
-If you aren\[aq]t using the default config file at
-\f[C]~/.gemstash/config.yml\f[] or
-\f[C]~/.gemstash/config.yml.erb\f[] (gemstash help customize.7), then
-you must specify the config file via this option.
-.IP \[bu] 2
-\f[C]\-\-key\ SECURE_KEY\f[]: Specify the API key to affect.
-This should be the actual key value, not a name.
-This option is required when using \f[C]\-\-remove\f[] but is optional
-otherwise.
-If adding an authorization, using this will either create or update the
-permissions for the specified API key.
-If missing, a new API key will always be generated.
-Note that a key can only have a maximum length of 255 chars.
-.IP \[bu] 2
-\f[C]\-\-remove\f[]: Remove an authorization rather than add or update
-one.
-When removing, permission values are not allowed.
-The \f[C]\-\-key\ <secure\-key>\f[] option is required.

data/lib/gemstash/man/gemstash-configuration.5

@@ -1,215 +0,0 @@
-.\" Automatically generated by Pandoc 1.19.2.1
-.\"
-.TH "gemstash\-configuration" "5" "October 13, 2015" "" ""
-.hy
-.SH NAME
-.PP
-gemstash\-configuration
-.SH SYNOPSIS
-.IP
-.nf
-\f[C]
-#\ ~/.gemstash/config.yml
-\-\-\-
-:base_path:\ "/var/gemstash"
-:cache_type:\ memcached
-:memcached_servers:\ localhost:11211
-:db_adapter:\ postgres
-:db_url:\ postgres:///gemstash
-:db_connection_options:
-\ \ :test:\ true
-\ \ :pool_timeout:\ 2
-:rubygems_url:\ https://my.gem\-source.local
-:puma_threads:\ 32
-:bind:\ tcp://0.0.0.0:4242
-:protected_fetch:\ true
-:fetch_timeout:\ 10
-:log_file:\ gemstash.log
-\f[]
-.fi
-.SH BASE PATH
-.PP
-\f[C]:base_path\f[]
-.PP
-Specifies where to store local files like the server log, cached gem
-files, and the database (when using SQLite).
-If the default is being used, the directory will be created if it does
-not exist.
-Any other directory needs to be created ahead of time and be writable to
-the Gemstash server process.
-Specifying the \f[C]:base_path\f[] via
-\f[C]gemstash\ setup\f[] (gemstash help setup.1) will create the
-directory for you.
-.SS DEFAULT VALUE
-.PP
-\f[C]~/.gemstash\f[]
-.SS VALID VALUES
-.PP
-Any valid path
-.SH CACHE TYPE
-.PP
-\f[C]:cache_type\f[]
-.PP
-Specifies how to cache values other than gem files (such as gem
-dependencies).
-\f[C]memory\f[] will use an in memory cache while \f[C]memcached\f[]
-will point to 1 or more Memcached servers.
-Use the \f[C]:memcached_servers\f[] configuration key for specifying
-where the Memcached server(s) are.
-.SS DEFAULT VALUE
-.PP
-\f[C]memory\f[]
-.SS VALID VALUES
-.PP
-\f[C]memory\f[], \f[C]memcached\f[]
-.SH MEMCACHED SERVERS
-.PP
-\f[C]:memcached_servers\f[]
-.PP
-Specifies the Memcached servers to connect to when using
-\f[C]memcached\f[] for the \f[C]:cache_type\f[].
-Only used when \f[C]memcached\f[] is used for \f[C]:cache_type\f[].
-.SS DEFAULT VALUE
-.PP
-\f[C]localhost:11211\f[]
-.SS VALID VALUES
-.PP
-A comma delimited list of Memcached servers
-.SH DB ADAPTER
-.PP
-\f[C]:db_adapter\f[]
-.PP
-Specifies what database adapter to use.
-When \f[C]sqlite3\f[] is used, the database will be located at
-\f[C]gemstash.db\f[] within the directory specified by
-\f[C]:base_path\f[].
-The database will automatically be created when using \f[C]sqlite3\f[].
-When \f[C]postgres\f[], \f[C]mysql\f[], or \f[C]mysql2\f[] is used, the
-database to connect to must be specified in the \f[C]:db_url\f[]
-configuration key.
-The database must already be created when using anything other than
-\f[C]sqlite3\f[].
-.SS DEFAULT VALUE
-.PP
-\f[C]sqlite3\f[]
-.SS VALID VALUES
-.PP
-\f[C]sqlite3\f[], \f[C]postgres\f[], \f[C]mysql\f[], \f[C]mysql2\f[]
-.SH DB URL
-.PP
-\f[C]:db_url\f[]
-.PP
-Specifies the database to connect to when using \f[C]postgres\f[],
-\f[C]mysql\f[], or \f[C]mysql2\f[] for the \f[C]:db_adapter\f[].
-Only used when the \f[C]:db_adapter\f[] is not \f[C]sqlite3\f[].
-.SS DEFAULT VALUE
-.PP
-None
-.SS VALID VALUES
-.PP
-A valid database URL for the Sequel gem (http://sequel.jeremyevans.net/)
-.SH DB CONNECTION OPTIONS
-.PP
-\f[C]:db_connection_options\f[]
-.PP
-Specifies additional \f[C]Sequel.connect\f[] options to use.
-Note that any options here are merged in with the default options, so
-you need not specify the \f[C]max_connections\f[] if you customize this
-option.
-.SS DEFAULT VALUE
-.PP
-\f[C]{\ max_connections:\ 1\ }\f[] for \f[C]sqlite3\f[] adapter,
-\f[C]{\ max_connections:\ config[:puma_threads]\ +\ 1\ }\f[] for any
-other adapter.
-.SS VALID VALUES
-.PP
-A valid connection options Hash for the
-Sequel.connect (http://sequel.jeremyevans.net/rdoc/files/doc/opening_databases_rdoc.html#label-General+connection+options)
-method.
-.SH RUBYGEMS URL
-.PP
-\f[C]:rubygems_url\f[]
-.PP
-Specifies the default gem source URL.
-When any API endpoint is called without a \f[C]/private\f[] or
-\f[C]/upstream/<url>\f[] prefix, this URL will be used to fetch the
-result.
-This value can be safely changed even if there are already gems stashed
-for the previous value.
-.SS DEFAULT VALUE
-.PP
-\f[C]https://rubygems.org\f[]
-.SS VALID VALUES
-.PP
-A valid gem source URL
-.SH PUMA THREADS
-.PP
-\f[C]:puma_threads\f[]
-.PP
-Specifies the number of threads used for the Gemstash server.
-.SS DEFAULT VALUE
-.PP
-\f[C]16\f[]
-.SS VALID VALUES
-.PP
-Integer value with a minimum of \f[C]1\f[]
-.SH BIND ADDRESS
-.PP
-\f[C]:bind\f[]
-.PP
-Specifies the binding used to start the Gemstash server.
-Keep in mind the user starting Gemstash needs to have access to bind in
-this manner.
-For example, if you use a port below 1024, you will need to run Gemstash
-as the root user.
-.SS DEFAULT VALUE
-.PP
-\f[C]tcp://0.0.0.0:9292\f[]
-.SS VALID VALUES
-.PP
-Any valid binding that is supported by
-Puma (https://github.com/puma/puma#binding-tcp--sockets)
-.SH PROTECTED FETCH
-.PP
-\f[C]:protected_fetch\f[]
-.PP
-Tells Gemstash to authenticate via an API key before allowing the
-fetching of private gems and specs.
-The default behavior is to allow unauthenticated download of private
-gems and specs.
-.SS DEFAULT VALUE
-.PP
-\f[C]false\f[]
-.SS VALID VALUES
-.PP
-Boolean values \f[C]true\f[] or \f[C]false\f[]
-.SH FETCH TIMEOUT
-.PP
-\f[C]:fetch_timeout\f[]
-.PP
-The timeout setting for fetching gems.
-Fetching gems over a slow connection may cause timeout errors.
-If you experience timeout errors, you may want to increase this value.
-The default is \f[C]20\f[] seconds.
-.SS DEFAULT VALUE
-.PP
-\f[C]20\f[]
-.SS VALID VALUES
-.PP
-Integer value with a minimum of \f[C]1\f[]
-.SH LOG FILE
-.PP
-\f[C]:log_file\f[]
-.PP
-Indicates the name of the file to use for logging.
-The file will be placed in the base
-path (gemstash help configuration.5).
-.SS DEFAULT VALUE
-.PP
-\f[C]server.log\f[]
-.SS VALID VALUES
-.PP
-Any valid file name, or \f[C]:stdout\f[] to log to \f[C]$stdout\f[]
-.PP
-\f[I]Note: Using \f[C]:stdout\f[] for the \f[C]:log_file\f[] requires
-running with \f[C]\-\-no\-daemonize\f[] (gemstash help start.1).\f[]