menagerie 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 947a489a82cedc5005f4c5a99505c0a5f84feaa8
-  data.tar.gz: a9a09a817f1887be19666b9513e1cc99d11aa288
+  metadata.gz: 7550ca99813f39e03b386723ccfa404099230f2a
+  data.tar.gz: 72fbf28be1428d0077774135b17569a46516dc40
 SHA512:
-  metadata.gz: 0132db19c6d99efb2e7e642785f025ff4302464bd88ab00cb331b43354343fd1675728302b5572dca5f25001d7298d27d6f7e2bbea56788a28f7d60238d63522
-  data.tar.gz: 0db5b60ead4c1ee71ef513a4dc7f5e256a43c3e7cf4dc577c9a0958ab18ac507c9327d7a95e72c01fcf007550c6ef3983a28434515f5e18d2785e20af6a34bc8
+  metadata.gz: 4d567d4062f2f80480385d56d4ff0e65a500d6b302482ded9ac7bbd49cbe6253d6b9b9a73d695dde2ca4bef7df0e35f077aadb879e05c1b01064b5bf9119c884
+  data.tar.gz: 7e4b2246187a47ca7c1084f72fff9335f55aff8adfcc797be954fad59b65dfa61555833e10ec9d5b49d39b0152b57d550a36bf647cf4cdf5d7c9fbb4433c679c

data/lib/menagerie/artifact.rb

@@ -5,24 +5,28 @@ module Menagerie
   ##
   # Artifacts are a stored file for a particular version of a project
   class Artifact
-    attr_reader :version, :name, :base, :path
+    attr_reader :version, :name, :path
 
     def initialize(params = {})
       @config = params
-      @path = @config[:path] || create
-      @base, @name = Pathname.new(path).split.map(&:to_s)
-      @version = File.basename File.readlink(path)
+      @config[:artifact] ? create : parse
     end
 
+    private
+
     def create
-      name, version, url = @config[:artifact].values_at :name, :version, :url
-      path = "#{@config[:paths][:artifacts]}/#{name}/#{version}"
+      @name, @version, url = @config[:artifact].values_at :name, :version, :url
+      @path = "#{@config[:paths][:artifacts]}/#{@name}/#{@version}"
       download url, path unless File.exist? path
       File.chmod(@config[:artifact][:mode], path) if @config[:artifact][:mode]
-      path
     end
 
-    private
+    def parse
+      link_path = @config[:path]
+      @name = Pathname.new(link_path).basename
+      @version = File.basename File.readlink(link_path)
+      @path = "#{@config[:paths][:artifacts]}/#{@name}/#{@version}"
+    end
 
     def download(url, path)
       FileUtils.mkdir_p File.dirname(path)

data/lib/menagerie/collection.rb

@@ -4,8 +4,8 @@ module Menagerie
   ##
   # Connection object that contains releases
   class Collection
-    def initialize(params = {})
-      params = Cymbal.symbolize params
+    def initialize(params = nil)
+      params = Cymbal.symbolize(params || {})
       @paths = default_paths.merge(params[:paths] || {})
       @options = default_options.merge(params[:options] || {})
     end
@@ -18,7 +18,7 @@ module Menagerie
 
     def create(artifacts)
       rotate
-      Release.new artifacts: artifacts, paths: @paths
+      Release.new artifacts: Cymbal.symbolize(artifacts), paths: @paths
       reap if @options[:reap]
       link_latest
     end
@@ -27,8 +27,9 @@ module Menagerie
 
     def rotate
       existing = releases.reverse.sort
-      existing.pop(existing.size - @options[:retention]).each(&:delete)
-      existing.each(&:rotate)
+      keepers = existing.shift(@options[:retention])
+      existing.each(&:delete)
+      keepers.each(&:rotate)
     end
 
     def reap

data/lib/menagerie/release.rb

@@ -14,7 +14,9 @@ module Menagerie
     end
 
     def artifacts
-      Dir.glob("#{@path}/*").map { |x| Artifact.new(path: x) }
+      Dir.glob("#{@path}/*").map do |x|
+        Artifact.new(path: x, paths: @config[:paths])
+      end
     end
 
     def <=>(other)
@@ -24,9 +26,9 @@ module Menagerie
 
     def create
       path = "#{@config[:paths][:releases]}/0"
-      FileUtils.mkdir path
+      FileUtils.mkdir_p path
       @config[:artifacts].each do |x|
-        artifact = Artifact.new artifact: x, paths: @paths
+        artifact = Artifact.new artifact: x, paths: @config[:paths]
         link artifact.path, "#{path}/#{x[:name]}"
       end
       path
@@ -35,7 +37,7 @@ module Menagerie
     def link(source, target)
       target_dir = Pathname.new(target).dirname
       relative_source = Pathname.new(source).relative_path_from(target_dir)
-      FileUtil.ln_s relative_source, target
+      FileUtils.ln_s relative_source, target
     end
 
     def rotate

data/menagerie.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'menagerie'
-  s.version     = '0.0.1'
+  s.version     = '0.0.2'
   s.date        = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: menagerie
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cymbal