gem_on_demand 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 517e2aeefdc0e9f09c3432de6c218d87f6f67587
-  data.tar.gz: 2d79c118bec199a2af27b74a90096ce852bc0840
+  metadata.gz: 6b6bcd00804e18316740f3994fedc5e6023610c5
+  data.tar.gz: c8ea84b03172bbe87a8e51365870e229e5a3a973
 SHA512:
-  metadata.gz: e8f8848702f5eacf1480cc2468337c4fc1cc9516f1b944a88cbc513fd8dae8558d01f6e7b49fda3eb66b5f99ea26964e81eebf248a5a626498780e5f9cc7d8c3
-  data.tar.gz: 78b4e5368d71432e328e1c1547dc8d48a2ac1146cea2b95c9d99eebd8fa32126e8bf9940d7d9173c8682dd7d44a6896b50d04f125764654337a153e23d41837f
+  metadata.gz: fe4905d4fd9018f8028bddf38c61ef28d0346b7e4e91c0af4f007e36c770669e1f36acd28641d7eb055f41555d230de15bf80b9139cf15101971082364158b76
+  data.tar.gz: 802126017f0d2d5b05a88d18514246e7c76469ca65c8cf7df5381d71b61bcd0641fd762886a5e7e8cd87bdb0e3142db4be1c2ac6b695fc3fd124d7375aa1b5e2

data/lib/gem_on_demand.rb

@@ -1,173 +1,43 @@
 require 'tmpdir'
+require 'gem_on_demand/checkout'
+require 'gem_on_demand/project'
+require 'gem_on_demand/utils'
+require 'gem_on_demand/file_cache'
 
 module GemOnDemand
-  PROJECT_CACHE = File.expand_path("~/.gem-on-demand/cache")
-  DATA_CACHE = "cache"
-  CACHE_DURATION = 15 * 60 # for project tags
-  ProjectNotFound = Class.new(Exception)
-  VERSION_REX = /^v?\d+\.\d+\.\d+(\.\w+)?$/ # with or without v and pre-release (cannot do others or we get: 'Malformed version number string 1.0.0-rails3' from bundler)
   HEAVY_FORKED = ["rails", "mysql", "mysql2"]
-  MAX_VERSIONS = 50 # some projects just have a million versions ...
-  DEPENDENCIES = "dependencies"
-  NOT_FOUND = "not-found"
-  UPDATED_AT = "updated_at"
 
   class << self
     def build_gem(user, project, version)
-      inside_of_project(user, project) do
-        cache("gem-#{version}") do
-          checkout_version("v#{version}")
-          gemspec = "#{project}.gemspec"
-          remove_signing(gemspec)
-          sh("gem build #{gemspec}")
-          File.read("#{project}-#{version}.gem")
-        end
+      checkout = Checkout.new(user, project)
+      checkout.chdir do
+        Project.new(user, project, checkout.cache).build_gem(version)
       end
     end
 
     def dependencies(user, gems)
       (gems - HEAVY_FORKED).map do |project|
-        project_dependencies(user, project)
+        checkout = Checkout.new(user, project)
+        begin
+          checkout.chdir do
+            Project.new(user, project, checkout.cache).dependencies
+          end
+        rescue Checkout::NotFound
+          []
+        end
       end.flatten
     end
 
+    # expire update related caches so next run gets fresh tags + versions
     def expire(user, project)
-      remove_directory "#{PROJECT_CACHE}/#{user}/#{project}/#{DATA_CACHE}"
-    end
-
-    private
-
-    def project_dependencies(user, project)
-      inside_of_project(user, project) do
-        cache DEPENDENCIES do
-          versions_for_project.last(MAX_VERSIONS).map do |version|
-            next unless dependencies = dependencies_for_version(project, version)
-            {
-              :name => project,
-              :number => version.sub(/^v/, ""),
-              :platform => "ruby",
-              :dependencies => Marshal.load(dependencies)
-            }
-          end.compact
-        end
-      end
-    rescue ProjectNotFound
-      []
-    end
-
-    def versions_for_project
-      sh("git tag").split($/).grep(VERSION_REX)
-    end
-
-    def dependencies_for_version(project, version)
-      cache "dependencies-#{version}" do
-        checkout_version(version)
-        sh(%{ruby -e 'print Marshal.dump(eval(File.read("#{project}.gemspec")).runtime_dependencies.map{|d| [d.name, d.requirement.to_s]})'}, :fail => :allow)
+      checkout = Checkout.new(user, project)
+      [
+        Checkout::UPDATED_AT,
+        Checkout::NOT_FOUND,
+        Project::DEPENDENCIES
+      ].each do |key|
+        checkout.cache.delete key
       end
     end
-
-    def cache(file, value = nil, &block)
-      ensure_directory(DATA_CACHE)
-      file = "#{DATA_CACHE}/#{file}"
-      if block
-        if File.exist?(file)
-          Marshal.load(File.read(file))
-        else
-          result = yield
-          File.write(file, Marshal.dump(result))
-          result
-        end
-      else
-        if value.nil?
-          Marshal.load(File.read(file)) if File.exist?(file)
-        else
-          File.write(file, Marshal.dump(value))
-        end
-      end
-    end
-
-    def expire_key(key)
-      key = "#{DATA_CACHE}/#{key}"
-      File.unlink(key) if File.exist?(key)
-    end
-
-    def sh(command, options = { })
-      puts command
-      result = `#{command}`
-      if $?.success?
-        result
-      elsif options[:fail] == :allow
-        false
-      else
-        raise "Command failed: #{result}"
-      end
-    end
-
-    def inside_of_project(user, project, &block)
-      dir = "#{PROJECT_CACHE}/#{user}"
-      ensure_directory(dir)
-      Dir.chdir(dir) do
-        clone_or_refresh_project(user, project)
-        Dir.chdir(project, &block)
-      end
-    end
-
-    def ensure_directory(dir)
-      FileUtils.mkdir_p(dir) unless File.directory?(dir)
-    end
-
-    def clone_or_refresh_project(user, project)
-      if File.directory?("#{project}/.git")
-        if refresh?(project)
-          Dir.chdir(project) do
-            sh "git fetch origin"
-            expire_key DEPENDENCIES
-          end
-          refreshed!(project)
-        end
-      elsif not_found?(project)
-        raise ProjectNotFound
-      else
-        remove_directory(project)
-        found = sh "git clone git@github.com:#{user}/#{project}.git", :fail => :allow
-        if found
-          refreshed!(project)
-        else
-          not_found!(project)
-          raise ProjectNotFound
-        end
-      end
-    end
-
-    def remove_directory(project)
-      FileUtils.rm_rf(project) if File.exist?(project)
-    end
-
-    def not_found?(project)
-      File.directory?(project) && Dir.chdir(project) { cache(NOT_FOUND) }
-    end
-
-    def not_found!(project)
-      ensure_directory(project)
-      Dir.chdir(project) { cache(NOT_FOUND, true) }
-    end
-
-    def refreshed!(project)
-      Dir.chdir(project) { cache(UPDATED_AT, Time.now.to_i) }
-    end
-
-    def refresh?(project)
-      Dir.chdir(project) { cache(UPDATED_AT).to_i } < Time.now.to_i - CACHE_DURATION
-    end
-
-    def checkout_version(version)
-      sh("git checkout #{version} --force")
-    end
-
-    # ERROR:  While executing gem ... (Gem::Security::Exception)
-    # certificate /CN=michael/DC=grosser/DC=it not valid after 2014-02-03 18:13:11 UTC
-    def remove_signing(gemspec)
-      File.write(gemspec, File.read(gemspec).gsub(/.*\.(signing_key|cert_chain).*/, ""))
-    end
   end
 end

data/lib/gem_on_demand/checkout.rb

@@ -0,0 +1,80 @@
+module GemOnDemand
+  class Checkout
+    NotFound = Class.new(Exception)
+    NOT_FOUND = "not-found"
+    UPDATED_AT = "updated_at"
+    DIR = File.expand_path("~/.gem-on-demand/cache")
+    CACHE_DURATION = 15 * 60 # for project tags
+
+    attr_accessor :user, :project
+
+    def initialize(user, project)
+      self.user = user
+      self.project = project
+      Utils.ensure_directory(dir)
+    end
+
+    def chdir(&block)
+      clone_or_refresh
+      Dir.chdir(dir, &block)
+    end
+
+    def cache
+      @cache ||= FileCache.new("#{dir}/cache")
+    end
+
+    private
+
+    def dir
+      "#{DIR}/#{user}/#{project}"
+    end
+
+    def was_not_found?
+      cache.read(NOT_FOUND)
+    end
+
+    def not_found!
+      cache.write(NOT_FOUND, true)
+      raise NotFound
+    end
+
+    def need_refresh?
+      cache.read(UPDATED_AT).to_i < Time.now.to_i - CACHE_DURATION
+    end
+
+    def fresh!
+      cache.write(UPDATED_AT, Time.now.to_i)
+    end
+
+    def clone_or_refresh
+      if cloned?
+        refresh if need_refresh?
+      elsif was_not_found?
+        not_found!
+      else
+        clone
+      end
+    end
+
+    def refresh
+      Dir.chdir(dir) { Utils.sh "git fetch origin" }
+      cache.delete Project::DEPENDENCIES
+      fresh!
+    end
+
+    def clone
+      Utils.remove_directory(dir)
+      cloned = Utils.sh "git clone git@github.com:#{user}/#{project}.git #{dir}", :fail => :allow
+      Utils.ensure_directory(dir)
+      if cloned
+        fresh!
+      else
+        not_found!
+      end
+    end
+
+    def cloned?
+      File.directory?("#{dir}/.git")
+    end
+  end
+end

data/lib/gem_on_demand/file_cache.rb

@@ -0,0 +1,28 @@
+module GemOnDemand
+  class FileCache
+    def initialize(dir)
+      @dir = dir
+    end
+
+    def write(file, value)
+      Utils.ensure_directory(@dir)
+      file = "#{@dir}/#{file}"
+      File.write(file, Marshal.dump(value))
+      value
+    end
+
+    def read(file)
+      file = "#{@dir}/#{file}"
+      Marshal.load(File.read(file)) if File.exist?(file)
+    end
+
+    def delete(file)
+      file = "#{@dir}/#{file}"
+      File.unlink(file) if File.exist?(file)
+    end
+
+    def fetch(file, &block)
+      read(file) || write(file, yield)
+    end
+  end
+end

data/lib/gem_on_demand/project.rb

@@ -0,0 +1,57 @@
+module GemOnDemand
+  class Project
+    MAX_VERSIONS = 50 # some projects just have a million versions ...
+    DEPENDENCIES = "dependencies"
+    VERSION_REX = /^v?\d+\.\d+\.\d+(\.\w+)?$/ # with or without v and pre-release (cannot do others or we get: 'Malformed version number string 1.0.0-rails3' from bundler)
+
+    attr_accessor :user, :name, :cache
+
+    def initialize(user, name, cache)
+      self.user = user
+      self.name = name
+      self.cache = cache
+    end
+
+    def dependencies
+      cache.fetch DEPENDENCIES do
+        versions.last(MAX_VERSIONS).map do |version|
+          next unless dependencies = dependencies_for_version(version)
+          {
+            :name => name,
+            :number => version.sub(/^v/, ""),
+            :platform => "ruby",
+            :dependencies => dependencies
+          }
+        end.compact
+      end
+    end
+
+    def build_gem(version)
+      cache.fetch("gem-#{version}") do
+        checkout_version("v#{version}")
+        gemspec = "#{name}.gemspec"
+        Utils.remove_signing(gemspec)
+        Utils.sh("gem build #{gemspec}")
+        File.read("#{name}-#{version}.gem")
+      end
+    end
+
+    private
+
+    def dependencies_for_version(version)
+      cache.fetch "dependencies-#{version}" do
+        checkout_version(version)
+        result = Utils.sh(%{ruby -e 'print Marshal.dump(eval(File.read("#{name}.gemspec")).runtime_dependencies.map{|d| [d.name, d.requirement.to_s]})'}, :fail => :allow)
+        Marshal.load(result) if result
+      end
+    end
+
+    def checkout_version(version)
+      Utils.sh("git checkout #{version} --force")
+    end
+
+    def versions
+      Utils.sh("git tag").split($/).grep(VERSION_REX)
+    end
+  end
+end

data/lib/gem_on_demand/utils.rb

@@ -0,0 +1,31 @@
+module GemOnDemand
+  module Utils
+    class << self
+      def sh(command, options = { })
+        puts command
+        result = `#{command}`
+        if $?.success?
+          result
+        elsif options[:fail] == :allow
+          false
+        else
+          raise "Command failed: #{result}"
+        end
+      end
+
+      def ensure_directory(dir)
+        FileUtils.mkdir_p(dir) unless File.directory?(dir)
+      end
+
+      def remove_directory(dir)
+        FileUtils.rm_rf(dir) if File.exist?(dir)
+      end
+
+      # ERROR:  While executing gem ... (Gem::Security::Exception)
+      # certificate /CN=michael/DC=grosser/DC=it not valid after 2014-02-03 18:13:11 UTC
+      def remove_signing(gemspec)
+        File.write(gemspec, File.read(gemspec).gsub(/.*\.(signing_key|cert_chain).*/, ""))
+      end
+    end
+  end
+end

data/lib/gem_on_demand/version.rb

@@ -1,3 +1,3 @@
 module GemOnDemand
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem_on_demand
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Grosser
@@ -30,7 +30,7 @@ cert_chain:
   F5etKHZg0j3eHO31/i2HnswY04lqGImUu6aM5EnijFTB7PPW2KwKKM4+kKDYFdlw
   /0WV1Ng2/Y6qsHwmqGg2VlYj2h4=
   -----END CERTIFICATE-----
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -54,8 +54,12 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE.txt
 - lib/gem_on_demand.rb
+- lib/gem_on_demand/checkout.rb
 - lib/gem_on_demand/cli.rb
+- lib/gem_on_demand/file_cache.rb
+- lib/gem_on_demand/project.rb
 - lib/gem_on_demand/server.rb
+- lib/gem_on_demand/utils.rb
 - lib/gem_on_demand/version.rb
 homepage: https://github.com/grosser/gem_on_demand
 licenses: