geminabox 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0d8d2b7b2d895ef9b0017f0e6b48132fa3e6a16
-  data.tar.gz: f333f2cf2dbf72221cc0fd281f8b720def07d2a0
+  metadata.gz: 29caab70af6b8cc64c9bf3ed4f0ef14fc55fdbe5
+  data.tar.gz: 52f389d19e17a11eaab222efeb999cc7cbd792e3
 SHA512:
-  metadata.gz: 9146b95e001840793b881bc3cb72dfc5103019251aa71ae1b0f5d3bd93fb59553ae2cc61478deaee5aa6615197c33149e99cc69cfac5c8c944b15b766af4accc
-  data.tar.gz: 1dc6216ac61f994bb72ce106c3717b03e8a5599330d1c9050683f2628277cbb3daa5d3038b1170e208013510133d8da2421c7bc6f9d2905cb1c1209505eda1fc
+  metadata.gz: 3c40834351d3cd2d1312c3accd677c85d86492cc8f14d1628440902c290f9ea59a46fe32452e8c346ac0a314cd04488471b9adf994f33c352a8c3fadf54de5ea
+  data.tar.gz: 58c88a1009a4843f64a0230ceb256aa33925f71a909405734dd62fe513776d8ae48612372f01a61cbed65989b69569e7bf51ac951f86f269496ab58dc9ce67d7

data/README.markdown

@@ -51,7 +51,7 @@ Or in config.ru (before the run command), set:
 
 If you want Geminabox to carry on providing gems when rubygems.org is unavailable, add this to config.ru:
 
-    Geminabox.allow_remote_failure = true 
+    Geminabox.allow_remote_failure = true
 
 ## HTTP adapter
 
@@ -66,7 +66,7 @@ and specify it in config.ru:
 It is recommend (but not essential) that your adapter inherits from HttpAdapter.
 The adapter will need to replace HttpAdapter's methods with those specific to
 the alternative HTTP gem. It should also be able to handle HTTP proxy
-settings. 
+settings.
 
 Defining your own adapter also allows you to configure Geminabox to use the
 local systems SSL certificates.
@@ -123,6 +123,38 @@ Simples!
       Description:
         Push a gem up to your GemInABox
 
+## Docker
+
+Using Gem in a Box is really simple with the Dockerfile.  Move this Dockerfile into a directory that you want to use for your server.
+
+That directory only needs to contain:
+
+```
+config.ru (explained above)
+Gemfile
+Gemfile.lock
+```
+
+Your Gemfile only needs:
+
+```ruby
+source 'https://rubygems.org'
+
+gem 'geminabox'
+```
+
+From there
+
+```
+docker build -t geminabox .
+```
+
+```
+docker run -d -p 9292:9292 geminabox:latest
+```
+
+Your server should now be running!
+
 ## Licence
 
 Fork it, mod it, choose it, use it, make it better. All under the MIT License.

data/lib/geminabox.rb

@@ -50,7 +50,8 @@ module Geminabox
       :lockfile,
       :retry_interval,
       :allow_remote_failure,
-      :ruby_gems_url
+      :ruby_gems_url,
+      :bundler_ruby_gems_url
     )
 
     def set_defaults(defaults)
@@ -70,20 +71,21 @@ module Geminabox
   end
 
   set_defaults(
-    data:                 File.join(File.dirname(__FILE__), *%w[.. data]),
-    public_folder:        File.join(File.dirname(__FILE__), *%w[.. public]),
-    build_legacy:         false,
-    incremental_updates:  true,
-    views:                File.join(File.dirname(__FILE__), *%w[.. views]),
-    allow_replace:        false,
-    gem_permissions:      0644,
-    rubygems_proxy:       (ENV['RUBYGEMS_PROXY'] == 'true'),
-    allow_delete:         true,
-    http_adapter:         HttpClientAdapter.new,
-    lockfile:             '/tmp/geminabox.lockfile',
-    retry_interval:       60,
-    allow_remote_failure: false,
-    ruby_gems_url:        'https://rubygems.org/'
+    data:                  File.join(File.dirname(__FILE__), *%w[.. data]),
+    public_folder:         File.join(File.dirname(__FILE__), *%w[.. public]),
+    build_legacy:          false,
+    incremental_updates:   true,
+    views:                 File.join(File.dirname(__FILE__), *%w[.. views]),
+    allow_replace:         false,
+    gem_permissions:       0644,
+    rubygems_proxy:        (ENV['RUBYGEMS_PROXY'] == 'true'),
+    allow_delete:          true,
+    http_adapter:          HttpClientAdapter.new,
+    lockfile:              '/tmp/geminabox.lockfile',
+    retry_interval:        60,
+    allow_remote_failure:  false,
+    ruby_gems_url:         'https://rubygems.org/',
+    bundler_ruby_gems_url: 'https://bundler.rubygems.org/'
   )
     
 end

data/lib/geminabox/disk_cache.rb

@@ -52,7 +52,7 @@ module Geminabox
 
     def read_int(key_hash)
       path = path(key_hash)
-      yield(path) if File.exists?(path)
+      yield(path) if File.exist?(path)
     end
 
     def write(key_hash, value)

data/lib/geminabox/gem_list_merge.rb

@@ -2,6 +2,8 @@ module Geminabox
   class GemListMerge
     attr_accessor :list
 
+    IGNORE_DEPENDENCIES = 0..-2
+
     def self.from(*lists)
       lists.map{|list| new(list)}.inject(:merge)
     end
@@ -11,40 +13,10 @@ module Geminabox
     end
 
     def merge(other)
-      combine_hashes(other).values.flatten.sort do |x, y|
-        x.values[ignore_dependencies] <=> y.values[ignore_dependencies]
-      end
-    end
-
-    def hash
-      list.each do |item|
-        ensure_symbols_as_keys(item)
-        name = item[:name].to_sym
-        collection[name] ||= []
-        collection[name] << item unless collection[name].include?(item)
-      end
-      collection
-    end
-
-    def collection
-      @collection ||= {}
-    end
-
-    def combine_hashes(other)
-      hash.merge(other.hash) do |key, value, other_value|
-        (value + other_value).uniq{|v| v.values[ignore_dependencies]}
-      end
-    end
-
-    def ignore_dependencies
-      0..-2
-    end
-
-    def ensure_symbols_as_keys(item)
-      item.keys.each do |key|
-        next if key.kind_of? Symbol
-        item[key.to_sym] = item.delete(key)
-      end
+      merged = (list + other.list)
+      merged.uniq! {|val| val.values[IGNORE_DEPENDENCIES] }
+      merged.sort_by! {|x| x.values[IGNORE_DEPENDENCIES] }
+      merged
     end
 
   end

data/lib/geminabox/gem_store.rb

@@ -48,7 +48,7 @@ module Geminabox
 
     private
     def ensure_existing_data_folder_compatible
-      if File.exists? Geminabox.data
+      if File.exist? Geminabox.data
         ensure_data_folder_is_directory
         ensure_data_folder_is_writable
       end

data/lib/geminabox/gem_store_error.rb

@@ -6,7 +6,7 @@ module Geminabox
     include Nesty::NestedError
 
     def initialize(code, reason)
-      @code = code.to_s
+      @code = code
       @reason = reason
     end
   end

data/lib/geminabox/http_adapter/http_client_adapter.rb

@@ -25,7 +25,10 @@ module Geminabox
     end
 
     def http_client
-      @http_client ||= HTTPClient.new(ENV['http_proxy'])
+      @http_client ||= HTTPClient.new(ENV['http_proxy']).tap {|client|
+        client.transparent_gzip_decompression = true
+        client.keep_alive_timeout = 32 # sec
+      }
     end
 
   end

data/lib/geminabox/proxy/copier.rb

@@ -21,7 +21,12 @@ module Geminabox
       end
 
       def get_remote
-        File.open(proxy_path, 'w'){|f| f.write(remote_content)}
+        begin
+          File.open(proxy_path, 'w'){|f| f.write(remote_content)}
+        rescue
+          File.unlink(proxy_path) if File.exists?(proxy_path)
+          raise $!
+        end
       end
 
     end

data/lib/geminabox/proxy/file_handler.rb

@@ -31,7 +31,7 @@ module Geminabox
       end
 
       def file_exists?(path)
-        File.exists? path
+        File.exist? path
       end
 
       def proxy_folder_path
@@ -71,7 +71,7 @@ module Geminabox
       end
 
       def proxy_folder_exists?
-        Dir.exists?(proxy_file_folder)
+        Dir.exist?(proxy_file_folder)
       end
 
       def create_proxy_folder
@@ -83,7 +83,7 @@ module Geminabox
       end
 
       def local_folder_exists?
-        Dir.exists?(local_file_folder)
+        Dir.exist?(local_file_folder)
       end
 
       def create_local_folder

data/lib/geminabox/proxy/hostess.rb

@@ -58,7 +58,7 @@ module Geminabox
 
         file = File.expand_path(File.join(Server.data, *request.path_info))
 
-        unless File.exists?(file)
+        unless File.exist?(file)
           ruby_gems_url = Geminabox.ruby_gems_url
           path = File.join(ruby_gems_url, *request.path_info)
           content = Geminabox.http_adapter.get_content(path)

data/lib/geminabox/rubygems_dependency.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'uri'
 
 module Geminabox
   module RubygemsDependency
@@ -13,14 +14,14 @@ module Geminabox
           gems.map(&:to_s).join(',')
         ].join
         body = Geminabox.http_adapter.get_content(url)
-        JSON.parse(body)
+        Marshal.load(body)
       rescue Exception => e
         return [] if Geminabox.allow_remote_failure
         raise e
       end
 
       def rubygems_uri
-        "https://bundler.rubygems.org/api/v1/dependencies.json"
+        URI.join(Geminabox.bundler_ruby_gems_url, '/api/v1/dependencies')
       end
 
     end

data/lib/geminabox/server.rb

@@ -125,7 +125,7 @@ module Geminabox
       end
 
       serialize_update do
-        File.delete file_path if File.exists? file_path
+        File.delete file_path if File.exist? file_path
         self.class.reindex(:force_rebuild)
         redirect url("/")
       end
@@ -221,7 +221,7 @@ HTML
 
     def all_gems_with_duplicates
       specs_files_paths.map do |specs_file_path|
-        if File.exists?(specs_file_path)
+        if File.exist?(specs_file_path)
           Marshal.load(Gem.gunzip(Gem.read_binary(specs_file_path)))
         else
           []
@@ -279,7 +279,7 @@ HTML
         File::open(spec_file, 'r') do |unzipped_spec_file|
           unzipped_spec_file.binmode
           Marshal.load(Gem.inflate(unzipped_spec_file.read))
-        end if File.exists? spec_file
+        end if File.exist? spec_file
       end
 
       def default_platform

data/lib/geminabox/version.rb

@@ -1,3 +1,3 @@
 module Geminabox
-  VERSION = '0.13.0' unless defined? VERSION
+  VERSION = '0.13.1' unless defined? VERSION
 end

data/lib/rubygems/commands/inabox_command.rb

@@ -85,7 +85,7 @@ class Gem::Commands::InaboxCommand < Gem::Command
     config = Gem.configuration.load_file(config_path).merge(:host => host)
 
     dirname = File.dirname(config_path)
-    Dir.mkdir(dirname) unless File.exists?(dirname)
+    Dir.mkdir(dirname) unless File.exist?(dirname)
 
     File.open(config_path, 'w') do |f|
       f.write config.to_yaml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Tom Lea
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra