hillary 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTY4ZWVkM2MxZjMwYmEyOGIxNGYyMmZhOTliMGVlYzI3MjFkNTVmNg==
+    Y2VjZmE1YTk5NDFjYWQ2MTlhOTlmMzMxZWVlNDcyMTM1OTU2MzkxZg==
   data.tar.gz: !binary |-
-    N2E4YzZlMmM5ZDZjZGVhMzZlMTZkYjAxMzY2MjNmNzM4NWYxYTQ4Ng==
+    YjgxODllNzQ1MDA4NjAwNWQ5MDVjNWI0MjMxMjZkZmI3MmFhMGNmMQ==
 SHA512:
   metadata.gz: !binary |-
-    MzMyMjhjZThlNTVhYTA4N2Q2NmY2YmM1YzU0OTFkOTYzNDhhYmNmMGQxZWI1
-    Yjk1OTFjZGI3NzY3MDdhMTM3YTQ5MDU4OWE5OWI4MTcxMzZjNTg5NDc1Y2Rl
-    ZDQ2ODIxY2U2OTUxZDE1OTFlM2Q4ZTZlOGNmYjYxOWZjODI1ZGE=
+    YWNhOTUwMzU4YjZmNjg4NTRkOTU4N2QzMDgyNmQ2YzgzM2UwMWM0MDhmMWI3
+    MjMxM2M2OTQyMzYzYWRmNTkyMTI5MDEwNjAwMTA4NWM4ZTBiOTE0YmY0Nzhk
+    MmY1NzM4NDhjYzg4ODg5ZjUzMTQyMDc0MzI2N2YyNjk0MzM3NDY=
   data.tar.gz: !binary |-
-    MjkyYzg2ZWMxMDgyNjhhODgzOTcyNDI4YjhkYjZmYmY5ZTg0MzA5MmMwNWMw
-    Y2YzNTVkYjJhYTZiYTI4NWRjODBmZjI5N2YyZTc0ODI2MWRhYzZhMmU1NzQx
-    MjIwYTdhNzA2NTM1ZTQ0YmIxNDRiOWJiMDk3NjVjNWI5ODgwYWQ=
+    OGI2ZWI5NDcwYjcyOTZlOTUwM2NmNWU0ZjIwODhhY2I0MDAzMmZiMmNlNzY1
+    YmYzNjVjZjg4NmJhNjU2MTg0ZjRmNWNlNjU2NmMxNDk3NmI3NGYxOWNmZTUy
+    MWE0NTE4OWZlNTAwODZjM2UxNzYzZGIzNjEyZGEzZGIwOTE1YmQ=

data/lib/hillary/repo/version.rb

@@ -4,8 +4,8 @@ module Hillary
   class Repo
     class Version
       BRANCHES = [
-        DEV = 'dev',
-        MASTER = 'master'
+        DEV = ENV['DEV_BRANCH'] || 'dev',
+        MASTER = ENV['MASTER_BRANCH'] || 'master'
       ]
 
       InvalidRepositoryState = Class.new(StandardError)

data/lib/hillary/shellable.rb

@@ -21,7 +21,7 @@ module Hillary
     def shell(command, options = {})
       options = {ignore_errors: false, logger: Logger.new($stdout)}.merge(options)
       logger = options[:logger]
-      logger.info(command)
+      logger.debug(command)
 
       output = `#{command} 2>1`
       status = $?

data/lib/hillary/slug/bucket.rb

@@ -15,6 +15,10 @@ module Hillary
         @directory = @storage.directories.get(name)
       end
 
+      def exists?(name)
+        @directory.files.head(name)
+      end
+
       def write(name, file)
         @directory.files.create(
           key: name,

data/lib/hillary/slug.rb

@@ -11,6 +11,7 @@ module Hillary
     attr_reader :branch, :version
 
     SlugArchiveError = Class.new(StandardError)
+    SlugNotFoundError = Class.new(StandardError)
 
     class << self
       def build(path = File.expand_path('.'), version = Repo::Version.create!, options = {})
@@ -23,16 +24,24 @@ module Hillary
     def initialize(path, version, options = {})
       @path = path
       @version = version
-      @logger = options[:logger] || Logger.new($stdout)
       @bucket = options[:bucket] || Bucket.new
 
-      logger.formatter = proc{|_, _, _, msg| msg + "\n"}
+      @logger = if options[:logger]
+        options[:logger]
+      else
+        Logger.new($stdout).tap do |logger|
+          logger.formatter = proc do |severity, time, _, msg|
+            "#{time.strftime('%Y-%m-%d %H:%M:%S')} #{severity} - #{msg}\n"
+          end
+        end
+      end
     end
 
     def build
       if version.master?
+        create_slug_if_missing
         copy_slug
-      else
+      elsif version.dev?
         create_slug
         upload_slug
       end
@@ -49,6 +58,18 @@ module Hillary
   private
     attr_reader :logger, :bucket, :path
 
+    def create_slug_if_missing
+      return if bucket.exists?(canonical_storage_slug_file)
+
+      if version.production?
+        raise SlugNotFoundError, "Attempted to create production slug from RC, but canonical slug (#{bucket.name}:/#{canonical_storage_slug_file}) couldn't be found"
+      else
+        logger.warn("Unable to find slug #{bucket.name}:/#{canonical_storage_slug_file}")
+        create_slug
+        upload_slug
+      end
+    end
+
     def copy_slug
       logger.info("Copying #{bucket.name}:/#{canonical_storage_slug_file} to #{bucket.name}:/#{storage_slug_file}")
       bucket.copy(canonical_storage_slug_file, storage_slug_file)
@@ -57,7 +78,10 @@ module Hillary
     def create_slug
       Dir.chdir(project_parent_directory) do
         logger.info("Creating slug #{canonical_slug_file}")
-        shell("tar --exclude \".git\" --exclude \"vendor/bundle\" -zcvf #{canonical_slug_file} #{project_name}")
+
+        command = "tar --exclude \".git\" --exclude \"vendor/bundle\" -zcvf #{canonical_slug_file} #{project_name}"
+
+        shell(command, logger: logger)
       end
     end
 

data/lib/hillary/version.rb

@@ -1,3 +1,3 @@
 module Hillary
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/hillary/slug/bucket_spec.rb

@@ -25,6 +25,17 @@ describe Hillary::Slug::Bucket do
 
   subject{Hillary::Slug::Bucket.new(bucket_name, access_key, secret_key)}
 
+  describe '#exists?' do
+    it 'returns false when the file does not exist' do
+      expect(subject.exists?(canonical_slug_path)).to be_falsy
+    end
+
+    it 'returns true when the file does exist' do
+      bucket.files.create(key: canonical_slug_path, body: StringIO.new(''), public: false)
+      expect(subject.exists?(canonical_slug_path)).to be_truthy
+    end
+  end
+
   describe '#write' do
     it 'writes the file to the bucket with the given name' do
       subject.write(canonical_slug_path, slug_file_path)

data/spec/hillary/slug_spec.rb

@@ -17,9 +17,10 @@ describe Hillary::Slug do
   let(:out){StringIO.new}
   let(:logger) do
     Logger.new(out).tap do |logger|
+      logger.formatter = proc{|_, _, _, msg| msg + "\n"}
     end
   end
-  let(:bucket){double(Hillary::Slug::Bucket, write: nil, copy: nil, name: 'gz-slugbucket')}
+  let(:bucket){double(Hillary::Slug::Bucket, write: nil, copy: nil, name: 'gz-slugbucket', exists?: true)}
   let(:path){File.expand_path('../../tmp/g3', __FILE__)}
 
   describe '.build' do
@@ -45,20 +46,22 @@ describe Hillary::Slug do
   end
 
   describe '#build' do
+    let(:slug_name){'g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz'}
+    let(:slug_path){Pathname.new(path).join('..', slug_name).expand_path}
+
+    before(:each){FileUtils.mkdir_p(path)}
+    after(:each){FileUtils.rm_rf(path)}
+
     context 'when branch is dev' do
       subject(:slug){described_class.new(path, version, logger: logger, bucket: bucket)}
-      let(:slug_name){'g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz'}
-      let(:slug_path){Pathname.new(path).join('..', slug_name).expand_path}
 
       describe 'when everything is successful' do
         before(:each) do
-          FileUtils.mkdir_p(path)
           allow(bucket).to receive(:write)
         end
 
         after(:each) do
           FileUtils.rm_rf(slug_path)
-          FileUtils.rm_rf(path)
         end
 
         it 'creates the slug' do
@@ -78,6 +81,7 @@ describe Hillary::Slug do
 
           expect(out.string).to eq(
             "Creating slug g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz\n"\
+            "tar --exclude \".git\" --exclude \"vendor/bundle\" -zcvf g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz g3\n"\
             'Uploading g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz '\
             "to gz-slugbucket:/dev/g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz\n"
           )
@@ -86,6 +90,7 @@ describe Hillary::Slug do
 
       describe 'when archiving fails' do
         it 'raises an error' do
+          FileUtils.rm_rf(path)
           expect{slug.build}.to raise_error(Hillary::Shellable::ExecutionError)
         end
       end
@@ -107,18 +112,55 @@ describe Hillary::Slug do
 
       subject(:slug){described_class.new(path, version, logger: logger, bucket: bucket)}
 
-      it 'copies the canonical slug to rc slug name' do
-        expect(bucket).to receive(:copy).with('dev/g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz', 'rc/g3_slug_RC2014_01_01_01_01_01.tar.gz')
+      context 'when the canonical slug exists' do
+        it 'copies the canonical slug to rc slug name' do
+          expect(bucket).to receive(:copy).with('dev/g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz', 'rc/g3_slug_RC2014_01_01_01_01_01.tar.gz')
 
-        slug.build
+          slug.build
+        end
+
+        it 'logs information about what is happening' do
+          slug.build
+
+          expect(out.string).to eq(
+            'Copying gz-slugbucket:/dev/g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz '\
+            "to gz-slugbucket:/rc/g3_slug_RC2014_01_01_01_01_01.tar.gz\n"
+          )
+        end
       end
 
-      it 'logs information about what is happening' do
-        slug.build
+      context 'when the canonical slug does not exist' do
+        before(:each){allow(bucket).to receive(:exists?).and_return(false)}
 
-        expect(out.string).to eq('Copying gz-slugbucket:/dev/g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz '\
-          "to gz-slugbucket:/rc/g3_slug_RC2014_01_01_01_01_01.tar.gz\n"
-        )
+        it 'creates the slug' do
+          slug.build
+
+          expect(File.exist?(slug_path)).to eq(true)
+        end
+
+        it 'writes the slug to the bucket' do
+          expect(bucket).to receive(:write).with('dev/' + slug_name, slug_path)
+
+          slug.build
+        end
+
+        it 'copies the canonical slug to rc slug name' do
+          expect(bucket).to receive(:copy).with('dev/g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz', 'rc/g3_slug_RC2014_01_01_01_01_01.tar.gz')
+
+          slug.build
+        end
+
+        it 'logs information about what is happening' do
+          slug.build
+
+          expect(out.string).to eq(
+            "Unable to find slug gz-slugbucket:/dev/g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz\n"\
+            "Creating slug g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz\n"\
+            "tar --exclude \".git\" --exclude \"vendor/bundle\" -zcvf g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz g3\n"\
+            "Uploading g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz to gz-slugbucket:/dev/g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz\n"\
+            "Copying gz-slugbucket:/dev/g3_slug_b26206aaf36207304d4fa583ce9837d0bdb48966.tar.gz to gz-slugbucket:/rc/g3_slug_RC2014_01_01_01_01_01.tar.gz\n"
+          )
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hillary
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Allen Madsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit