geminabox 0.7.0 → 0.8.0

data/README.markdown

@@ -41,6 +41,14 @@ RubyGems supports generating indexes for the so called legacy versions (< 1.2),
 
     gem inabox pkg/my-awesome-gem-1.0.gem
 
+Configure Gem in a box (interactive prompt to specify where to upload to):
+
+    geminabox -c
+
+Change the host to upload to:
+
+    geminabox -g HOST
+
 Simples!
 
 ## Licence

data/lib/geminabox.rb

@@ -18,6 +18,7 @@ class Geminabox < Sinatra::Base
   set :incremental_updates, false
   set :views, File.join(File.dirname(__FILE__), *%w[.. views])
   set :allow_replace, false
+  set :gem_permissions, 0644
   use Hostess
 
   class << self
@@ -33,6 +34,7 @@ class Geminabox < Sinatra::Base
   end
 
   autoload :GemVersionCollection, "geminabox/gem_version_collection"
+  autoload :GemVersion, "geminabox/gem_version"
   autoload :DiskCache, "geminabox/disk_cache"
 
   before do
@@ -54,7 +56,7 @@ class Geminabox < Sinatra::Base
     query_gems = params[:gems].split(',').sort
     cache_key = query_gems.join(',')
     disk_cache.cache(cache_key) do
-      deps = load_gems.gems.select {|gem| query_gems.include?(gem.name) }.map do |gem|
+      deps = load_gems.select {|gem| query_gems.include?(gem.name) }.map do |gem|
         spec = spec_for(gem.name, gem.number)
         {
           :name => gem.name,
@@ -123,14 +125,14 @@ class Geminabox < Sinatra::Base
         error_response(200, "Ignoring upload, you uploaded the same thing previously.")
       end
     end
-    
+
     atomic_write(dest_filename) do |f|
       while blk = tmpfile.read(65536)
         f << blk
       end
     end
     reindex
-    
+
     if api_request?
       "Gem #{gem_name} received and indexed."
     else
@@ -187,15 +189,19 @@ HTML
     @disk_cache = Geminabox::DiskCache.new(File.join(settings.data, "_cache"))
   end
 
+  def all_gems
+    %w(specs prerelease_specs).map{ |specs_file_type|
+      specs_file_path = File.join(settings.data, "#{specs_file_type}.#{Gem.marshal_version}.gz")
+      if File.exists?(specs_file_path)
+        Marshal.load(Gem.gunzip(Gem.read_binary(specs_file_path)))
+      else
+        []
+      end
+    }.inject(:|)
+  end
+
   def load_gems
-    @loaded_gems ||=
-      %w(specs prerelease_specs).inject(GemVersionCollection.new){|gems, specs_file_type|
-        specs_file_path = File.join(settings.data, "#{specs_file_type}.#{Gem.marshal_version}.gz")
-        if File.exists?(specs_file_path)
-          gems |= Geminabox::GemVersionCollection.new(Marshal.load(Gem.gunzip(Gem.read_binary(specs_file_path))))
-        end
-        gems
-      }
+    @loaded_gems ||= Geminabox::GemVersionCollection.new(all_gems)
   end
 
   def index_gems(gems)
@@ -210,8 +216,9 @@ HTML
     yield temp_file
     temp_file.close
     File.rename(temp_file.path, file_name)
+    File.chmod(settings.gem_permissions, file_name)
   end
-  
+
   helpers do
     def spec_for(gem_name, version)
       spec_file = File.join(settings.data, "quick", "Marshal.#{Gem.marshal_version}", "#{gem_name}-#{version}.gemspec.rz")

data/lib/geminabox/gem_version.rb

@@ -24,6 +24,11 @@ class Geminabox::GemVersion
     sort
   end
 
+  def ==(other)
+    return false unless other.class == self.class
+    [name, number, platform] == [other.name, other.number, other.platform]
+  end
+
   def gemfile_name
     included_platform = ruby? ? nil : platform
     [name, number, included_platform].compact.join('-')

data/lib/geminabox/gem_version_collection.rb

@@ -1,61 +1,63 @@
 require 'geminabox/gem_version'
 
+# This class represents a sorted collection of Geminabox::GemVersion objects.
+# It it used widely throughout the system for displaying and filtering gems.
 class Geminabox::GemVersionCollection
   include Enumerable
 
-  def size
-    @gems.size
-  end
-
-  attr_reader :gems
-
+  # Array of Geminabox::GemVersion objects, or an array of [name, version,
+  # platform] triples.
   def initialize(initial_gems=[])
-    @gems = []
-    initial_gems.each { |gemdef| self << gemdef }
-  end
-
-  def <<(version_or_def)
-    version = if version_or_def.is_a?(Geminabox::GemVersion)
-                version_or_def
-              else
-                Geminabox::GemVersion.new(*version_or_def)
-              end
-
-    @gems << version
-    @gems.sort!
+    @gems = initial_gems.map{|object|
+      coerce_to_gem_version(object)
+    }.sort
   end
 
+  # FIXME: Terminology makes no sense when the version are not all of the same
+  # name
   def oldest
     @gems.first
   end
 
+  # FIXME: Terminology makes no sense when the version are not all of the same
+  # name
   def newest
     @gems.last
   end
 
-  def |(other)
-    self.class.new(self.gems | other.gems)
+  def size
+    @gems.size
   end
 
   def each(&block)
     @gems.each(&block)
   end
 
-  def by_name
-    grouped = @gems.inject(hash_of_collections) do |grouped, gem|
-      grouped[gem.name] << gem
-      grouped
-    end.sort_by{|name, gems| name.downcase }
+  # The collection can contain gems of different names, this method groups them
+  # by name, and then sorts the different version of each name by version and
+  # platform.
+  #
+  # yields 'foo_gem', version_collection
+  def by_name(&block)
+    @grouped ||= @gems.group_by(&:name).map{|name, collection|
+      [name, Geminabox::GemVersionCollection.new(collection)]
+    }.sort_by{|name, collection|
+      name.downcase
+    }
 
     if block_given?
-      grouped.each(&Proc.new)
+      @grouped.each(&block)
     else
-      grouped
+      @grouped
     end
   end
 
-  private
-  def hash_of_collections
-    Hash.new { |h,k| h[k] = self.class.new }
+private
+  def coerce_to_gem_version(object)
+    if object.is_a?(Geminabox::GemVersion)
+      object
+    else
+      Geminabox::GemVersion.new(*object)
+    end
   end
 end

data/lib/geminabox/version.rb

@@ -1 +1 @@
-GeminaboxVersion = '0.7.0' unless defined? GeminaboxVersion
+GeminaboxVersion = '0.8.0' unless defined? GeminaboxVersion

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geminabox
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70182476864760 !ruby/object:Gem::Requirement
+  requirement: &70361993784940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182476864760
+  version_requirements: *70361993784940
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70182476863120 !ruby/object:Gem::Requirement
+  requirement: &70361993784400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182476863120
+  version_requirements: *70361993784400
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70182476861740 !ruby/object:Gem::Requirement
+  requirement: &70361993783860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182476861740
+  version_requirements: *70361993783860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70182476861160 !ruby/object:Gem::Requirement
+  requirement: &70361993783320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182476861160
+  version_requirements: *70361993783320
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70182476859960 !ruby/object:Gem::Requirement
+  requirement: &70361993782680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182476859960
+  version_requirements: *70361993782680
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70182476858640 !ruby/object:Gem::Requirement
+  requirement: &70361993781820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182476858640
+  version_requirements: *70361993781820
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70182480431960 !ruby/object:Gem::Requirement
+  requirement: &70361993797280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182480431960
+  version_requirements: *70361993797280
 - !ruby/object:Gem::Dependency
   name: capybara-mechanize
-  requirement: &70182480428020 !ruby/object:Gem::Requirement
+  requirement: &70361993796080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182480428020
+  version_requirements: *70361993796080
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70182480424560 !ruby/object:Gem::Requirement
+  requirement: &70361993795380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182480424560
+  version_requirements: *70361993795380
 description: A sinatra based gem hosting app, with client side gem push style functionality.
 email: contrib@tomlea.co.uk
 executables: []
@@ -152,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4127424449105456213
+      hash: -1477264842366552590
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4127424449105456213
+      hash: -1477264842366552590
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15