gemstash 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f8e00734475c4c0595f454b66b51e73ff7849a2
-  data.tar.gz: 8d1c6e0529760867d971639cd8b975c58066b961
+  metadata.gz: fe7e58da58c18944e118fc19063e7f4c730b8d9d
+  data.tar.gz: ed5e51504ea2fe809bbc01a6305351d9e73a6811
 SHA512:
-  metadata.gz: 2a20cb02a68ff45c9692416ac8f6722b3c6f3fe668d9349062d4fce1f77f6b30fdb6e9dc5cb48c859141ea8bf54f7b7fb7cc835d6c6cdec3397b483b248f58f6
-  data.tar.gz: 7eefc0b5bed7915a71f2f4f26a7f481ae489b1fb0cef6aad594861c414dc737b662ae72d543f87d81f40d3759dc6885c67a65b389e52f08c9195aea9bc7b0ef9
+  metadata.gz: 87f204c3e9f05fc452889a42a16063553c77abe937fed20a71646e3eea3740c960ecb3949c634e181ad5709b7288664f80db7f72d9ba9e41f4fcc6c6c1097f25
+  data.tar.gz: 305da0681b3c5b7bfd6be10534c490a7dfde10f55ac30add6cbdfd816c66f6cc49ae1c897cd42a53aa863fd4141300510e988ad28a52f99fb8c4029dc13be1ee

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.0.2 (2016-07-07)
+
+### Bugfixes
+
+  - Fix broken JRuby build ([#91](https://github.com/bundler/gemstash/pull/91), [@smellsblue](https://github.com/smellsblue))
+  - Drop www.rubygems.org in favor of rubygems.org ([#101](https://github.com/bundler/gemstash/pull/101), [@smellsblue](https://github.com/smellsblue))
+  - Redirect /versions and /info/* to index.rubygems.org ([#102](https://github.com/bundler/gemstash/pull/102), [@smellsblue](https://github.com/smellsblue))
+
 ## 1.0.1 (2016-02-23)
 
 ### Bugfixes

data/README.md

@@ -4,8 +4,8 @@
 
 ## What is Gemstash?
 
-Gemstash is both a cache for remote servers such as https://www.rubygems.org,
-and a private gem source.
+Gemstash is both a cache for remote servers such as https://rubygems.org, and a
+private gem source.
 
 If you are using [bundler](http://bundler.io/) across many machines that have
 access to a server within your control, you might want to use Gemstash.
@@ -16,7 +16,7 @@ you might want to use Gemstash.
 If you frequently bundle the same set of gems across multiple projects, you
 might want to use Gemstash.
 
-Are you only using gems from https://www.rubygems.org, and don't bundle the same
+Are you only using gems from https://rubygems.org, and don't bundle the same
 gems frequently? Well, maybe you don't need Gemstash... yet.
 
 ## Quickstart Guide
@@ -67,11 +67,11 @@ otherwise Gemstash will have nothing to stash. Now bundle:
 $ bundle install --path .bundle
 ```
 
-Your Gemstash server has fetched the gems from https://www.rubygems.org and
-cached them for you! To prove this, you can disable your Internet connection and
-try again. The gem dependencies from https://www.rubygems.org are cached for 30
-minutes, so if you bundle again before that, you can successfully bundle without
-an Internet connection:
+Your Gemstash server has fetched the gems from https://rubygems.org and cached
+them for you! To prove this, you can disable your Internet connection and try
+again. The gem dependencies from https://rubygems.org are cached for 30 minutes,
+so if you bundle again before that, you can successfully bundle without an
+Internet connection:
 
 ```
 $ # Disable your Internet first!
@@ -112,7 +112,7 @@ Gemstash temporarily caches things like gem dependencies in memory. Anything
 cached in memory will last for 30 minutes before being retrieved again. You can
 [use memcached](docs/config.md#cache) instead of caching in memory. Gem files
 are always cached permanently, so bundling with a `Gemfile.lock` with all gems
-cached will never call out to https://www.rubygems.org.
+cached will never call out to https://rubygems.org.
 
 The server you ran is provided via [Puma](http://puma.io/) and
 [Rack](http://rack.github.io/), however they are not customizable at this point.

data/docs/deploy.md

@@ -4,7 +4,7 @@ Bundler is here for the rescue to keep Gemstash up to date! Create a `Gemfile`
 pointing to Gemstash:
 ```ruby
 # ./Gemfile
-source "https://www.rubygems.org"
+source "https://rubygems.org"
 gem "gemstash"
 ```
 

data/docs/multiple_sources.md

@@ -8,8 +8,8 @@ Gemstash server.
 
 When you don't provide an explicit source (as with the [Quickstart
 Guide](../README.md#quickstart-guide)), your gems will be fetched from
-https://www.rubygems.org. This default source is not set in stone. To change it,
-you need only edit the Gemstash configuration found at `~/.gemstash/config.yml`:
+https://rubygems.org. This default source is not set in stone. To change it, you
+need only edit the Gemstash configuration found at `~/.gemstash/config.yml`:
 ```yaml
 # ~/.gemstash/config.yml
 ---
@@ -30,9 +30,9 @@ separate location, ensuring different sources won't leak between each other.
 ## Bundling with Multiple Sources
 
 Changing the default source won't help you if you need to bundle against
-https://www.rubygems.org along with additional sources. If you need to bundle
-with multiple gem sources, Gemstash doesn't need to be specially configured.
-Your Gemstash server will honor any gem source specified via a specialized URL.
+https://rubygems.org along with additional sources. If you need to bundle with
+multiple gem sources, Gemstash doesn't need to be specially configured. Your
+Gemstash server will honor any gem source specified via a specialized URL.
 Consider the following `Gemfile`:
 ```ruby
 # ./Gemfile
@@ -58,7 +58,7 @@ your `Gemfile` like so:
 ```ruby
 # ./Gemfile
 require "cgi"
-source "http://localhost:9292/redirect/#{CGI.escape("https://www.rubygems.org")}"
+source "http://localhost:9292/redirect/#{CGI.escape("https://rubygems.org")}"
 gem "rubywarrior"
 ```
 

data/docs/private_gems.md

@@ -36,7 +36,7 @@ $ gemstash authorize --key e374e237fdf5fa5718d2a21bd63dc911
 ```
 
 With the key generated, you'll need to tell Rubygems about your new key. If
-you've pushed a gem to https://www.rubygems.org, then you will already have a
+you've pushed a gem to https://rubygems.org, then you will already have a
 credentials file to add the key to. If not, run the following commands before
 modifying the credentials file:
 ```

data/docs/reference.md

@@ -123,7 +123,7 @@ Specifies the database to connect to when using `postgres` for the
 
 ### :rubygems_url
 
-**Default value:** `https://www.rubygems.org`
+**Default value:** `https://rubygems.org`
 
 **Valid values:** A valid gem source URL
 

data/lib/gemstash/configuration.rb

@@ -4,11 +4,11 @@ module Gemstash
   #:nodoc:
   class Configuration
     DEFAULTS = {
-      :cache_type => "memory",
-      :base_path => File.expand_path("~/.gemstash"),
-      :db_adapter => "sqlite3",
-      :bind => "tcp://0.0.0.0:9292",
-      :rubygems_url => "https://www.rubygems.org"
+      cache_type: "memory",
+      base_path: File.expand_path("~/.gemstash"),
+      db_adapter: "sqlite3",
+      bind: "tcp://0.0.0.0:9292",
+      rubygems_url: "https://rubygems.org"
     }.freeze
 
     DEFAULT_FILE = File.expand_path("~/.gemstash/config.yml").freeze

data/lib/gemstash/gem_source/upstream_source.rb

@@ -60,11 +60,11 @@ module Gemstash
       end
 
       def serve_versions
-        redirect upstream.url("versions", request.query_string)
+        redirect index_upstream.url("versions", request.query_string)
       end
 
       def serve_info(name)
-        redirect upstream.url("info/#{name}", request.query_string)
+        redirect index_upstream.url("info/#{name}", request.query_string)
       end
 
       def serve_marshal(id)
@@ -97,6 +97,17 @@ module Gemstash
         @upstream ||= Gemstash::Upstream.new(env["gemstash.upstream"],
           user_agent: env["gemstash.user-agent"])
       end
+
+      def index_upstream
+        @index_upstream ||=
+          if upstream.uri.host == "rubygems.org"
+            uri = upstream.uri.dup
+            uri.host = "index.rubygems.org"
+            Gemstash::Upstream.new(uri, user_agent: upstream.user_agent)
+          else
+            upstream
+          end
+      end
     end
 
     # GemSource for gems in an upstream server.

data/lib/gemstash/upstream.rb

@@ -1,11 +1,12 @@
 require "digest"
+require "uri"
 
 module Gemstash
   #:nodoc:
   class Upstream
     extend Forwardable
 
-    attr_reader :user_agent
+    attr_reader :user_agent, :uri
 
     def_delegators :@uri, :scheme, :host, :user, :password, :to_s
 

data/lib/gemstash/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemstash
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Andre Arko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli