gemstash 1.0.0.pre.3 → 1.0.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af8acc09e82627c900cabfb1cbadb9ac1bb4935f
-  data.tar.gz: d0fd544e6506ec5930eae821595c6bd3276f5135
+  metadata.gz: f5a0e21d8484a3788102eb3c17efe992b484f407
+  data.tar.gz: e076bb584f76301f806c8479f1e27d18b5853443
 SHA512:
-  metadata.gz: 48f3eed8bb96a55434b942e7fcf16c4d965d00f3cee105e1eaa15b2120f1b02957db600fdc76571fc06a0d2354b3bd7d9c898a11fbc742c5f5b7d6f05a2086c2
-  data.tar.gz: 6e09a7c5d0ca727f2e64ed439dd84c185982b2a25bb223649d3964c18305a60925e3a03aceb46447b63559376131f03c0551c28894d687cefb0bec325a72f5bc
+  metadata.gz: 2d1339519304f001e2f9ec394d56dd4826ab9775982f45e804eb8b3e028d50a0efd5c3abf8bbb046291c0dc4ea6463b7b08d7adbe3d64935359f9dec3aa9db39
+  data.tar.gz: 9672f47d249e673d79eb76cc0b943fd13497dba969ad363712c608ace051add7feaddab442554cafa11bd2cf4af4cacfb0b5a3ef9ed39d0b346a7185b9328e7d

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.0.0.pre.4 (2015-12-23)
+
+### Upgrade Notes
+
+  Any gems fetched before this release won't be indexed, which means plugins you
+  might install can't know about them. These cached gems might also have
+  incorrect headers stored (which shouldn't affect bundling). If you wish to
+  correct this, you can delete or back up your cache by deleting or moving your
+  `~/.gemstash/gem_cache` directory.
+
+### Bugfixes
+
+  - Cached gem and spec headers don't clobber each other ([#68](https://github.com/bundler/gemstash/pull/68), [@smellsblue](https://github.com/smellsblue))
+
+### Features
+
+  - Index cached gems and their upstreams for future use of plugins ([#68](https://github.com/bundler/gemstash/pull/68), [@smellsblue](https://github.com/smellsblue))
+
 ## 1.0.0.pre.3 (2015-12-21)
 
 ### Bugfixes

data/lib/gemstash/db.rb

@@ -8,8 +8,10 @@ module Gemstash
     Sequel::Model.raise_on_save_failure = true
     Sequel::Model.plugin :timestamps, update_on_create: true
     autoload :Authorization, "gemstash/db/authorization"
+    autoload :CachedRubygem, "gemstash/db/cached_rubygem"
     autoload :Dependency,    "gemstash/db/dependency"
     autoload :Rubygem,       "gemstash/db/rubygem"
+    autoload :Upstream,      "gemstash/db/upstream"
     autoload :Version,       "gemstash/db/version"
   end
 end

data/lib/gemstash/db/cached_rubygem.rb

@@ -0,0 +1,17 @@
+require "gemstash"
+
+module Gemstash
+  module DB
+    # Sequel model for cached_rubygems table.
+    class CachedRubygem < Sequel::Model
+      def self.store(upstream, gem_name, resource_type)
+        db.transaction do
+          upstream_id = Gemstash::DB::Upstream.find_or_insert(upstream)
+          record = self[upstream_id: upstream_id, name: gem_name.name, resource_type: resource_type.to_s]
+          return record.id if record
+          new(upstream_id: upstream_id, name: gem_name.name, resource_type: resource_type.to_s).tap(&:save).id
+        end
+      end
+    end
+  end
+end

data/lib/gemstash/db/upstream.rb

@@ -0,0 +1,12 @@
+module Gemstash
+  module DB
+    # Sequel model for upstreams table.
+    class Upstream < Sequel::Model
+      def self.find_or_insert(upstream)
+        record = self[uri: upstream.to_s]
+        return record.id if record
+        new(uri: upstream.to_s, host_id: upstream.host_id).tap(&:save).id
+      end
+    end
+  end
+end

data/lib/gemstash/gem_source/upstream_source.rb

@@ -160,7 +160,15 @@ module Gemstash
       def fetch_remote_gem(gem_name, gem_resource, resource_type)
         log.info "Gem #{gem_name.name} is not cached, fetching #{resource_type}"
         gem_fetcher.fetch(gem_name.id, resource_type) do |content, properties|
-          gem_resource.save({ resource_type => content }, headers: { resource_type => properties })
+          resource_properties = {
+            upstream: upstream.to_s,
+            gem_name: gem_name.name,
+            headers: { resource_type => properties }
+          }
+
+          gem = gem_resource.save({ resource_type => content }, resource_properties)
+          Gemstash::DB::CachedRubygem.store(upstream, gem_name, resource_type)
+          gem
         end
       end
     end

data/lib/gemstash/migrations/03_cached_gems.rb

@@ -0,0 +1,24 @@
+Sequel.migration do
+  change do
+    create_table :upstreams do
+      primary_key :id
+      String :uri, size: 191, null: false
+      String :host_id, size: 191, null: false
+      DateTime :created_at, null: false
+      DateTime :updated_at, null: false
+      index [:uri], unique: true
+      index [:host_id], unique: true
+    end
+
+    create_table :cached_rubygems do
+      primary_key :id
+      Integer :upstream_id, null: false
+      String :name, size: 191, null: false
+      String :resource_type, size: 191, null: false
+      DateTime :created_at, null: false
+      DateTime :updated_at, null: false
+      index [:upstream_id, :resource_type, :name], unique: true
+      index [:name]
+    end
+  end
+end

data/lib/gemstash/storage.rb

@@ -139,7 +139,7 @@ module Gemstash
     #
     # Separate calls to save for the same resource will replace existing files,
     # and add new ones. Properties on additional calls will be merged with
-    # existing properties.
+    # existing properties. Nested hashes in properties will also be merged.
     #
     # Examples:
     #
@@ -181,12 +181,23 @@ module Gemstash
     end
 
     # Update the metadata properties of this resource. The +props+ will be
-    # merged with any existing properties.
+    # merged with any existing properties. Nested hashes in the properties will
+    # also be merged.
     #
     # @param props [Hash] the properties to add
     # @return [Gemstash::Resource] self for chaining purposes
     def update_properties(props)
       load_properties(true)
+
+      deep_merge = proc do |_, old_value, new_value|
+        if old_value.is_a?(Hash) && new_value.is_a?(Hash)
+          old_value.merge(new_value, &deep_merge)
+        else
+          new_value
+        end
+      end
+
+      props = properties.merge(props || {}, &deep_merge)
       save_properties(properties.merge(props || {}))
       self
     end

data/lib/gemstash/version.rb

@@ -1,4 +1,4 @@
 #:nodoc:
 module Gemstash
-  VERSION = "1.0.0.pre.3"
+  VERSION = "1.0.0.pre.4"
 end

data/rake/changelog.citrus

@@ -83,7 +83,7 @@ grammar Changelog::Grammar
   end
 
   rule paragraph
-    ("  " !"- " /\w[^\n]*/ "\n")+ "\n"
+    ("  " !"- " /(\w|`)[^\n]*/ "\n")+ "\n"
   end
 
   rule changes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gemstash
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.3
+  version: 1.0.0.pre.4
 platform: ruby
 authors:
 - Andre Arko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli
@@ -283,8 +283,10 @@ files:
 - lib/gemstash/configuration.rb
 - lib/gemstash/db.rb
 - lib/gemstash/db/authorization.rb
+- lib/gemstash/db/cached_rubygem.rb
 - lib/gemstash/db/dependency.rb
 - lib/gemstash/db/rubygem.rb
+- lib/gemstash/db/upstream.rb
 - lib/gemstash/db/version.rb
 - lib/gemstash/dependencies.rb
 - lib/gemstash/env.rb
@@ -301,6 +303,7 @@ files:
 - lib/gemstash/logging.rb
 - lib/gemstash/migrations/01_gem_dependencies.rb
 - lib/gemstash/migrations/02_authorizations.rb
+- lib/gemstash/migrations/03_cached_gems.rb
 - lib/gemstash/puma.rb
 - lib/gemstash/rack_env_rewriter.rb
 - lib/gemstash/specs_builder.rb
@@ -331,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A place to stash gems you'll need