geminabox 0.11.1 → 0.12.0

data/lib/geminabox/gem_list_merge.rb

@@ -0,0 +1,51 @@
+module Geminabox
+  class GemListMerge
+    attr_accessor :list
+
+    def self.from(*lists)
+      lists.map{|list| new(list)}.inject(:merge)
+    end
+
+    def initialize(list)
+      @list = list
+    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
+    end
+
+  end
+end

data/lib/geminabox/gem_store.rb

@@ -1,97 +1,99 @@
+module Geminabox
 
+  class GemStore
+    attr_accessor :gem, :overwrite
 
-class GemStore
-  attr_accessor :gem, :overwrite
+    def self.create(gem, overwrite = false)
+      gem_store = new(gem, overwrite)
+      gem_store.save
+    end
 
-  def self.create(gem, overwrite = false)
-    gem_store = new(gem, overwrite)
-    gem_store.save
-  end
-  
-  def initialize(gem, overwrite = false)
-    @gem = gem
-    @overwrite = overwrite && overwrite == 'true'
-  end
+    def initialize(gem, overwrite = false)
+      @gem = gem
+      @overwrite = overwrite && overwrite == 'true'
+    end
 
-  def save
-    ensure_gem_valid
-    prepare_data_folders
-    check_replacement_status
-    write_and_index
-  end
+    def save
+      ensure_gem_valid
+      prepare_data_folders
+      check_replacement_status
+      write_and_index
+    end
 
-  def prepare_data_folders
-    ensure_existing_data_folder_compatible
-    begin
-      FileUtils.mkdir_p(File.join(Geminabox.data, "gems"))
-    rescue
-      raise GemStoreError.new(
-        500,
-        "Could not create #{File.expand_path(Geminabox.data)}."
-      )
+    def prepare_data_folders
+      ensure_existing_data_folder_compatible
+      begin
+        FileUtils.mkdir_p(File.join(Geminabox.data, "gems"))
+      rescue
+        raise GemStoreError.new(
+          500,
+          "Could not create #{File.expand_path(Geminabox.data)}."
+        )
+      end
     end
-  end
 
-  def check_replacement_status
-    if !overwrite and Geminabox.disallow_replace? and File.exist?(gem.dest_filename)
-      if existing_file_digest != gem.hexdigest
-        raise GemStoreError.new(409, "Updating an existing gem is not permitted.\nYou should either delete the existing version, or change your version number.")
-      else
-        raise GemStoreError.new(200, "Ignoring upload, you uploaded the same thing previously.\nPlease use -o to ovewrite.")
+    def check_replacement_status
+      if !overwrite and Geminabox::Server.disallow_replace? and File.exist?(gem.dest_filename)
+        if existing_file_digest != gem.hexdigest
+          raise GemStoreError.new(409, "Updating an existing gem is not permitted.\nYou should either delete the existing version, or change your version number.")
+        else
+          raise GemStoreError.new(200, "Ignoring upload, you uploaded the same thing previously.\nPlease use -o to ovewrite.")
+        end
       end
     end
-  end
 
-  def ensure_gem_valid
-    raise GemStoreError.new(400, "Cannot process gem") unless gem.valid?
-  end
+    def ensure_gem_valid
+      raise GemStoreError.new(400, "Cannot process gem") unless gem.valid?
+    end
 
-  private
-  def ensure_existing_data_folder_compatible
-    if File.exists? Geminabox.data
-      ensure_data_folder_is_directory
-      ensure_data_folder_is_writable
+    private
+    def ensure_existing_data_folder_compatible
+      if File.exists? Geminabox.data
+        ensure_data_folder_is_directory
+        ensure_data_folder_is_writable
+      end
     end
-  end
 
-  def ensure_data_folder_is_directory
-    raise GemStoreError.new(
-      500,
-      "Please ensure #{File.expand_path(Geminabox.data)} is a directory."
-    ) unless File.directory? Geminabox.data
-  end
+    def ensure_data_folder_is_directory
+      raise GemStoreError.new(
+        500,
+        "Please ensure #{File.expand_path(Geminabox.data)} is a directory."
+      ) unless File.directory? Geminabox.data
+    end
 
-  def ensure_data_folder_is_writable
-    raise GemStoreError.new(
-      500,
-      "Please ensure #{File.expand_path(Geminabox.data)} is writable by the geminabox web server."
-    ) unless File.writable? Geminabox.data
-  end
+    def ensure_data_folder_is_writable
+      raise GemStoreError.new(
+        500,
+        "Please ensure #{File.expand_path(Geminabox.data)} is writable by the geminabox web server."
+      ) unless File.writable? Geminabox.data
+    end
 
-  def existing_file_digest
-    Digest::SHA1.file(gem.dest_filename).hexdigest
-  end
+    def existing_file_digest
+      Digest::SHA1.file(gem.dest_filename).hexdigest
+    end
 
-  def write_and_index
-    tmpfile = gem.gem_data
-    atomic_write(gem.dest_filename) do |f|
-      while blk = tmpfile.read(65536)
-        f << blk
+    def write_and_index
+      tmpfile = gem.gem_data
+      atomic_write(gem.dest_filename) do |f|
+        while blk = tmpfile.read(65536)
+          f << blk
+        end
       end
+      Geminabox::Server.reindex
+    end
+
+    # based on http://as.rubyonrails.org/classes/File.html
+    def atomic_write(file_name)
+      temp_dir = File.join(Geminabox.data, "_temp")
+      FileUtils.mkdir_p(temp_dir)
+      temp_file = Tempfile.new("." + File.basename(file_name), temp_dir)
+      temp_file.binmode
+      yield temp_file
+      temp_file.close
+      File.rename(temp_file.path, file_name)
+      File.chmod(Geminabox::Server.gem_permissions, file_name)
     end
-    Geminabox.reindex
-  end
 
-  # based on http://as.rubyonrails.org/classes/File.html
-  def atomic_write(file_name)
-    temp_dir = File.join(Geminabox.data, "_temp")
-    FileUtils.mkdir_p(temp_dir)
-    temp_file = Tempfile.new("." + File.basename(file_name), temp_dir)
-    temp_file.binmode
-    yield temp_file
-    temp_file.close
-    File.rename(temp_file.path, file_name)
-    File.chmod(Geminabox.gem_permissions, file_name)
   end
 
 end

data/lib/geminabox/gem_store_error.rb

@@ -1,12 +1,13 @@
 require 'nesty'
+module Geminabox
+  class GemStoreError < StandardError
+    attr_reader :code, :reason
 
-class GemStoreError < StandardError
-  attr_reader :code, :reason
+    include Nesty::NestedError
 
-  include Nesty::NestedError
-
-  def initialize(code, reason)
-    @code = code.to_s
-    @reason = reason
+    def initialize(code, reason)
+      @code = code.to_s
+      @reason = reason
+    end
   end
 end

data/lib/geminabox/gem_version.rb

@@ -1,36 +1,40 @@
-class Geminabox::GemVersion
-  attr_accessor :name, :number, :platform
+module Geminabox
 
-  def initialize(name, number, platform)
-    @name = name
-    @number = number
-    @platform = platform
-  end
+  class GemVersion
+    attr_accessor :name, :number, :platform
 
-  def ruby?
-    !!(platform =~ /ruby/i)
-  end
+    def initialize(name, number, platform)
+      @name = name
+      @number = number
+      @platform = platform
+    end
 
-  def version
-    Gem::Version.create(number)
-  end
+    def ruby?
+      !!(platform =~ /ruby/i)
+    end
 
-  def <=>(other)
-    sort = other.name <=> name
-    sort = version <=>  other.version       if sort.zero?
-    sort = (other.ruby? && !ruby?) ? 1 : -1 if sort.zero? && ruby? != other.ruby?
-    sort = other.platform <=> platform      if sort.zero?
+    def version
+      Gem::Version.create(number)
+    end
 
-    sort
-  end
+    def <=>(other)
+      sort = other.name <=> name
+      sort = version <=>  other.version       if sort.zero?
+      sort = (other.ruby? && !ruby?) ? 1 : -1 if sort.zero? && ruby? != other.ruby?
+      sort = other.platform <=> platform      if sort.zero?
 
-  def ==(other)
-    return false unless other.class == self.class
-    [name, number, platform] == [other.name, other.number, other.platform]
-  end
+      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('-')
+    def gemfile_name
+      included_platform = ruby? ? nil : platform
+      [name, number, included_platform].compact.join('-')
+    end
   end
+
 end

data/lib/geminabox/gem_version_collection.rb

@@ -1,63 +1,65 @@
-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
-
-  # Array of Geminabox::GemVersion objects, or an array of [name, version,
-  # platform] triples.
-  def initialize(initial_gems=[])
-    @gems = initial_gems.map{|object|
-      coerce_to_gem_version(object)
-    }.sort
-  end
+module Geminabox
 
-  # FIXME: Terminology makes no sense when the version are not all of the same
-  # name
-  def oldest
-    @gems.first
-  end
+  # This class represents a sorted collection of Geminabox::GemVersion objects.
+  # It it used widely throughout the system for displaying and filtering gems.
+  class GemVersionCollection
+    include Enumerable
 
-  # FIXME: Terminology makes no sense when the version are not all of the same
-  # name
-  def newest
-    @gems.last
-  end
+    # Array of Geminabox::GemVersion objects, or an array of [name, version,
+    # platform] triples.
+    def initialize(initial_gems=[])
+      @gems = initial_gems.map{|object|
+        coerce_to_gem_version(object)
+      }.sort
+    end
 
-  def size
-    @gems.size
-  end
+    # FIXME: Terminology makes no sense when the version are not all of the same
+    # name
+    def oldest
+      @gems.first
+    end
 
-  def each(&block)
-    @gems.each(&block)
-  end
+    # FIXME: Terminology makes no sense when the version are not all of the same
+    # name
+    def newest
+      @gems.last
+    end
 
-  # 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(&block)
-    else
-      @grouped
+    def size
+      @gems.size
+    end
+
+    def each(&block)
+      @gems.each(&block)
+    end
+
+    # 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(&block)
+      else
+        @grouped
+      end
     end
-  end
 
-private
-  def coerce_to_gem_version(object)
-    if object.is_a?(Geminabox::GemVersion)
-      object
-    else
-      Geminabox::GemVersion.new(*object)
+  private
+    def coerce_to_gem_version(object)
+      if object.is_a?(Geminabox::GemVersion)
+        object
+      else
+        Geminabox::GemVersion.new(*object)
+      end
     end
   end
+  
 end

data/lib/geminabox/hostess.rb

@@ -0,0 +1,46 @@
+require 'sinatra/base'
+
+module Geminabox
+
+  class Hostess < Sinatra::Base
+    def serve
+      send_file(File.expand_path(File.join(Server.data, *request.path_info)), :type => response['Content-Type'])
+    end
+
+    %w[/specs.4.8.gz
+       /latest_specs.4.8.gz
+       /prerelease_specs.4.8.gz
+    ].each do |index|
+      get index do
+        content_type 'application/x-gzip'
+        serve
+      end
+    end
+
+    %w[/quick/Marshal.4.8/*.gemspec.rz
+       /yaml.Z
+       /Marshal.4.8.Z
+    ].each do |deflated_index|
+      get deflated_index do
+        content_type('application/x-deflate')
+        serve
+      end
+    end
+
+    %w[/yaml
+       /Marshal.4.8
+       /specs.4.8
+       /latest_specs.4.8
+       /prerelease_specs.4.8
+    ].each do |old_index|
+      get old_index do
+        serve
+      end
+    end
+
+    get "/gems/*.gem" do
+      serve
+    end
+
+  end
+end