opendelivery 0.0.5 → 0.0.6

data/lib/opendelivery.rb

@@ -1,4 +1,4 @@
-require 'opendelivery/version.rb'
+require 'opendelivery/source_control.rb'
 require 'opendelivery/artifact.rb'
 require 'opendelivery/domain.rb'
 require 'opendelivery/image.rb'

data/lib/opendelivery/image.rb

@@ -1,3 +1,5 @@
+require 'aws-sdk'
+
 module OpenDelivery
   class Image
 

data/lib/opendelivery/source_control.rb

@@ -0,0 +1,79 @@
+module OpenDelivery
+  class SourceControl
+    def initialize(dir)
+      @dir = dir
+    end
+
+    def log(lines=10)
+      Dir.chdir(@dir) do
+        `git log --stat -n #{lines}`
+      end
+    end
+
+    def status
+      Dir.chdir(@dir) do
+        `git status -sb`
+      end
+    end
+
+    def remove_missing_files(status)
+      removed_files = []
+      files = find_removed_files(status)
+      files.each do |file|
+        Dir.chdir(@dir) do
+          removed_files << `git rm -rf #{file}`
+        end
+      end
+      removed_files
+    end
+
+    def add(files)
+      Dir.chdir(@dir) do
+        `git add #{files} -v`
+      end
+    end
+
+    def commit(message)
+      Dir.chdir(@dir) do
+        `git commit -m "#{message}"`
+      end
+    end
+
+    def push
+      Dir.chdir(@dir) do
+        `git push`
+      end
+    end
+
+    def pull
+      Dir.chdir(@dir) do
+        @result = `git pull`
+      end
+      if $?.to_i != 0
+        raise "Your pull failed. Probably because of a merge conflict!"
+      end
+      @result
+    end
+
+    def conflicted(status)
+      status.each_line do |stat|
+        if stat.match(/^UU /) || stat.match(/^U /) || stat.match(/^U /)
+          raise "You have file conflicts when trying to merge. Because this could end up horribly, we won't try to automatically fix these conflicts. Please go an manually merge the files!"
+        end
+      end
+    end
+
+    protected
+
+
+    def find_removed_files(status)
+      statuses = []
+      status.each_line do |stat|
+        if stat.match(/^ D /)
+          statuses << stat.split[1]
+        end
+      end
+      statuses
+    end
+  end
+end

data/lib/opendelivery/stack.rb

@@ -9,7 +9,7 @@ module OpenDelivery
       else
         @cfn = AWS::CloudFormation.new(:region => region)
       end
-      @domain = OpenDelivery::Domain.new
+      @domain = OpenDelivery::Domain.new region
     end
 
 
@@ -63,10 +63,10 @@ module OpenDelivery
       end
     end
 
-    def destroy(domain, stack_name)
+    def destroy(domain, stack_name, wait=false)
       stack = @cfn.stacks[stack_name]
       stack.delete
-      while stack.exists?
+      while wait and stack.exists?
         sleep 20
       end
       @domain.destroy_item(domain, stack_name)

data/lib/opendelivery/storage.rb

@@ -15,19 +15,31 @@ module OpenDelivery
       @s3.buckets[bucket].objects[key].copy_to(desired_key)
     end
 
-    def upload(file, bucket, key)
+    def upload(bucket, file, key)
       @s3.buckets[bucket].objects[key].write(:file => file)
     end
 
     def download(bucket, key, output_directory)
+      # Puke if the bucket doesn't exist
+      raise "Bucket #{bucket} doesn't exist" unless @s3.buckets[bucket].exists?
+
+      # Puke if the key doesn't exist. This can cause problems with some bucket policies, so we catch and re-throw
+      begin
+        raise "File with key #{key} doesn't exist in bucket #{bucket}" unless @s3.buckets[bucket].objects[key].exists?
+      rescue Exception => e
+        raise "Exception [#{e.message}] occurred downloading key #{key} from bucket #{bucket}"
+      end
+
       obj = @s3.buckets[bucket].objects[key]
 
       base = Pathname.new("#{obj.key}").basename
 
       Dir.mkdir(output_directory) unless File.exists?(output_directory)
 
-      File.open("#{output_directory}/#{base}", 'w') do |file|
-        file.write(obj.read)
+      File.open("#{output_directory}/#{base}", 'wb') do |file|
+        obj.read do |chunk|
+          file.write(chunk)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opendelivery
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -71,9 +71,9 @@ files:
 - lib/opendelivery/artifact.rb
 - lib/opendelivery/domain.rb
 - lib/opendelivery/image.rb
+- lib/opendelivery/source_control.rb
 - lib/opendelivery/stack.rb
 - lib/opendelivery/storage.rb
-- lib/opendelivery/version.rb
 homepage: http://stelligent.com
 licenses:
 - MIT

data/lib/opendelivery/version.rb

@@ -1,3 +0,0 @@
-module OpenDelivery
-  VERSION = '0.0.5'
-end