spitball 0.2.1 → 0.2.2

data/Rakefile

@@ -21,7 +21,7 @@ begin
     gem.summary = "get a bundle"
     gem.description = "Use bundler to generate gem tarball packages."
     gem.email = "freels@twitter.com"
-    gem.homepage = "http://twitter.com"
+    gem.homepage = "http://github.com/freels/spitball"
     gem.authors = ["Matt Freels", "Brandon Mitchell"]
 
     gem.add_dependency 'bundler', '>= 0.9.5'

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/bin/spitball-cache-cleanup

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+require 'spitball'
+require 'optparse'
+
+args = {}
+
+opts = OptionParser.new do |opts|
+  opts.banner = "Usage: spitball-cache-cleanup [options]"
+  opts.separator ""
+  opts.separator "options:"
+
+  opts.on('-w', '--access-window SECONDS', 'Access window within which tarballs are kept. Default 30 days') do |access_window|
+    args[:access_window] = access_window
+  end
+end
+
+opts.permute!(ARGV)
+
+args[:access_window] ||= 2592000
+
+Spitball::Repo.clean_up_unused(args[:access_window].to_i)

data/bin/spitball-server

@@ -25,7 +25,7 @@ mime_type :tgz, 'application/x-compressed'
 # return json array of cached SHAs
 get '/list' do
   content_type :json
-  JSON.dump Spitball::Repo.list_cached
+  JSON.dump Spitball::Repo.cached_digests
 end
 
 # return tgz or gemfile of cached SHA or 404

data/lib/spitball/remote.rb

@@ -3,7 +3,7 @@ require 'uri'
 
 class Spitball::Remote
 
-  WAIT_SECONDS = 30
+  WAIT_SECONDS = 240
 
   def initialize(gemfile, host, port)
     @gemfile = gemfile

data/lib/spitball/repo.rb

@@ -9,14 +9,18 @@ module Spitball::Repo
   end
 
   def exist?(digest)
-    File.exist? path(digest, 'tgz')
+    File.exist? tarball(digest)
+  end
+
+  def tarball(digest)
+    path(digest, 'tgz')
   end
 
   def gemfile(digest)
-    File.read path(digest, 'gemfile')
+    path(digest, 'gemfile')
   end
 
-  def list_cached
+  def cached_digests
     Dir[File.join(WORKING_DIR, 'bundle_*.tgz')].map do |path|
       path.match(/bundle_(.*?)\.tgz$/)[1]
     end.compact.uniq.sort
@@ -25,4 +29,18 @@ module Spitball::Repo
   def make_cache_dir
     FileUtils.mkdir_p WORKING_DIR
   end
+
+  def clean_up_unused(access_window)
+    cutoff_time = Time.now - access_window
+
+    cached_digests.each do |digest|
+      stat = File.stat(tarball(digest))
+      access_time = [stat.atime, stat.mtime].max
+
+      if access_time < cutoff_time
+        File.unlink(tarball(digest)) if File.exist? tarball(digest)
+        File.unlink(gemfile(digest)) if File.exist? gemfile(digest)
+      end
+    end
+  end
 end

data/spec/spitball_spec.rb

@@ -148,27 +148,49 @@ describe Spitball::Repo do
   end
 
   describe "exist?" do
-    it "returns true if tarball for a digest has been exists" do
+    it "returns true if tarball for a digest exists" do
       Spitball::Repo.exist?('digest').should_not == true
       File.open(Spitball::Repo.path('digest', 'tgz'), 'w') {|f| f.write 'tarball!' }
       Spitball::Repo.exist?('digest').should == true
     end
   end
 
+  describe "tarball" do
+    it "returns the path of the cached tarball for a digest" do
+      Spitball::Repo.tarball('digest').should == Spitball::Repo.path('digest', 'tgz')
+    end
+  end
+
   describe "gemfile" do
-    it "returns the contents of the cached gemfile for a digest" do
-      gemfile = 'gem :memcached'
-      File.open(Spitball::Repo.path('digest', 'gemfile'), 'w') {|f| f.write gemfile }
-      Spitball::Repo.gemfile('digest').should == gemfile
+    it "returns the path of the cached gemfile for a digest" do
+      Spitball::Repo.gemfile('digest').should == Spitball::Repo.path('digest', 'gemfile')
     end
   end
 
-  describe "list_cached" do
+  describe "cached_digests" do
     it "returns a list of cached bundles" do
-      File.open(Spitball::Repo.path('digest', 'tgz'), 'w') {|f| f.write 'tarball!' }
-      File.open(Spitball::Repo.path('digest2', 'tgz'), 'w') {|f| f.write 'tarball2!' }
+      File.open(Spitball::Repo.tarball('digest'), 'w') {|f| f.write 'tarball!' }
+      File.open(Spitball::Repo.tarball('digest2'), 'w') {|f| f.write 'tarball2!' }
+
+      Spitball::Repo.cached_digests.should == ['digest', 'digest2']
+    end
+  end
+
+  describe "clean_up_unused" do
+    it "removes cached tarballs and gemfiles that haven't been accessed within a certain period" do
+      File.open(Spitball::Repo.tarball('digest'), 'w') {|f| f.write 'tarball!' }
+      File.open(Spitball::Repo.gemfile('digest'), 'w') {|f| f.write 'gemfile!' }
+
+      sleep 2
+      File.open(Spitball::Repo.tarball('digest2'), 'w') {|f| f.write 'tarball2!' }
+      File.open(Spitball::Repo.gemfile('digest2'), 'w') {|f| f.write 'gemfile2!' }
+
+      Spitball::Repo.clean_up_unused(1)
 
-      Spitball::Repo.list_cached.should == ['digest', 'digest2']
+      File.exist?(Spitball::Repo.tarball('digest')).should_not == true
+      File.exist?(Spitball::Repo.gemfile('digest')).should_not == true
+      File.exist?(Spitball::Repo.tarball('digest2')).should == true
+      File.exist?(Spitball::Repo.gemfile('digest2')).should == true
     end
   end
 end

data/spitball.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{spitball}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels", "Brandon Mitchell"]
-  s.date = %q{2010-08-05}
+  s.date = %q{2010-08-23}
   s.description = %q{Use bundler to generate gem tarball packages.}
   s.email = %q{freels@twitter.com}
-  s.executables = ["spitball", "spitball-server"]
+  s.executables = ["spitball", "spitball-cache-cleanup", "spitball-server"]
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/spitball",
+     "bin/spitball-cache-cleanup",
      "bin/spitball-server",
      "lib/spitball.rb",
      "lib/spitball/digest.rb",
@@ -34,7 +35,7 @@ Gem::Specification.new do |s|
      "spec/spitball_spec.rb",
      "spitball.gemspec"
   ]
-  s.homepage = %q{http://twitter.com}
+  s.homepage = %q{http://github.com/freels/spitball}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spitball
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Matt Freels
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -07:00
+date: 2010-08-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ description: Use bundler to generate gem tarball packages.
 email: freels@twitter.com
 executables: 
 - spitball
+- spitball-cache-cleanup
 - spitball-server
 extensions: []
 
@@ -94,6 +95,7 @@ files:
 - Rakefile
 - VERSION
 - bin/spitball
+- bin/spitball-cache-cleanup
 - bin/spitball-server
 - lib/spitball.rb
 - lib/spitball/digest.rb
@@ -105,7 +107,7 @@ files:
 - spec/spitball_spec.rb
 - spitball.gemspec
 has_rdoc: true
-homepage: http://twitter.com
+homepage: http://github.com/freels/spitball
 licenses: []
 
 post_install_message: