harpoon 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67816218225a067d3f8b66c9673338f17204fd3d
-  data.tar.gz: 75ba5ab88e915ad54987f0518a620ba4bbeb19b8
+  metadata.gz: 785a0b17a5308ada400cdcdcbb89add7f665446d
+  data.tar.gz: b752390ed81dca7ab9c8d4391c2beb1e628a1651
 SHA512:
-  metadata.gz: 5f61d684a67f40527bc41396e63d3a5115ae2d02ca4677b315890b33cb6202f90ea50bfab68022ab3bd6895ed51ab86fd3574a8a52c3d4fff8005b3c2158e6f3
-  data.tar.gz: d1af82d8c71e92dcdabf854a91cdbc451413dc169f2e4498dfb59f0418aeb768e30fde4bcc560b3ec25f082060b1daac800d4e92f393219afea5e9c65be5a302
+  metadata.gz: 38b0d89349672d7067ae295ba17df1f0f2260bb7daad15dc9c2a5e4d7dbdadaab5a2854ae1857e5e1f5948d057aee3991abffd1a0e46853368d813724ff238ca
+  data.tar.gz: 87d9b4359c0ba94fbeed1810700d3fcef3846bf9b7a1c6d10166e6e9061a98537472238babf11f1319f3990a4f20d590d2706085ce5f1404e8e20de2ed04d3d0

data/harpoon.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'harpoon'
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.date        = '2014-08-20'
   s.summary     = "A single page app deployer for amazon s3"
   s.description = "Deploy small server-less webapps to amazon s3, including buckets, dns and permissions"
@@ -9,11 +9,12 @@ Gem::Specification.new do |s|
   s.licenses     = ["MIT"]
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.add_dependency "thor",       "~> 0.19.1"
-  s.add_dependency "netrc",       "~> 0.7.7"
-  s.add_dependency "aws-sdk",     "~> 1.51.0"
-  s.add_dependency "public_suffix", "~> 1.4.5"
-  s.add_dependency 'colorize', '~> 0.7.3'
-  s.add_dependency 'activesupport', "~> 4.1.5"
+  s.add_runtime_dependency 'thor', '~> 0.19', '>= 0.19.1'
+  s.add_runtime_dependency 'netrc', '~> 0.7', '>= 0.7.7'
+  s.add_runtime_dependency 'aws-sdk', '~> 1.51', '>= 1.51.0'
+  s.add_runtime_dependency 'bitballoon', '~> 0.2', '>= 0.2.5'
+  s.add_runtime_dependency 'public_suffix', '~> 1.4', '>= 1.4.5'
+  s.add_runtime_dependency 'colorize', '~> 0.7', '>= 0.7.3'
+  s.add_runtime_dependency 'activesupport', '~> 4.1', '>= 4.1.5'
   s.homepage    = 'http://www.getharpoon.com'
 end

data/lib/harpoon/auth.rb

@@ -37,13 +37,19 @@ module Harpoon
 			end
 		end
 
-		def get_or_ask(key, mes1 = "Private Key", mes2 = "Public Key")
+		def get_or_ask(key, mes1 = nil, mes2 = nil)
 			values = get(key)
 			return values if values
-			puts "Enter your #{mes1}:"
-			val1 = $stdin.gets.to_s.strip
-			puts "Enter your #{mes2}:"
-			val2 = $stdin.gets.to_s.strip
+			val1 = nil
+			val2 = nil
+			if mes1
+				puts "Enter your #{mes1}:"
+				val1 = $stdin.gets.to_s.strip
+			end
+			if mes2
+				puts "Enter your #{mes2}:"
+				val2 = $stdin.gets.to_s.strip
+			end
 			set(key, val1, val2)
 			return [val1, val2]
 		end
@@ -52,7 +58,7 @@ module Harpoon
 
 		#netrc doesn't like nil values
 		def netrc_nil(value = nil)
-			if value
+			if value && value != ""
 				if value == "nothing-here"
 					return nil
 				else

data/lib/harpoon/client.rb

@@ -42,10 +42,10 @@ module Harpoon
 			runner.list
 		end
 
-		desc "rollback", "Rollback to previous release"
-		def rollback
+		desc "rollback VERSION", "Rollback to previous release"
+		def rollback(version)
 			runner = Harpoon::Runner.new(options)
-			runner.rollback
+			runner.rollback(version)
 		end
 	end
 end

data/lib/harpoon/service.rb

@@ -38,6 +38,7 @@ module Harpoon
     def initialize(config, auth, logger)
       @logger = logger
       @auth = {}
+      @config = config
       @options = self.class.default_options.dup
 
       @options.deep_merge!(config.hosting_options || {})

data/lib/harpoon/services/bitballoon.rb

@@ -0,0 +1,104 @@
+require "bitballoon"
+module Harpoon
+  module Services
+    class Bitballoon
+      include Harpoon::Service
+
+      auth :secret, "Access Token"
+
+      def setup
+        #setup for future deploys
+        if site
+          @logger.pass "Site already configured"
+        else
+          bitballoon.sites.create(:name => @config.name)
+          @logger.pass "Site configured as #{@config.name}"
+        end
+        if @options.primary_domain
+          site.update(custom_domain: @options.primary_domain)
+          @logger.pass "Custom Domain configured"
+        end
+        @logger.suggest "You should run `harpoon doctor` to confirm setup"
+      end
+
+      def deploy
+        #deploy new code
+        if site
+          if @config.directory
+            @logger.info "Deploying #{@config.directory}"
+            deploy = site.deploys.create(dir: @config.directory)
+            site.wait_for_ready
+            @logger.pass "Deployed."
+          else
+            @logger.fatal "We don't know what to deploy!"
+          end
+        else
+          @logger.fatal "Uh oh, please run `harpoon doctor`"
+        end
+      end
+
+      def list
+        #list available rollbacks
+        if site
+          @logger.info "The following rollbacks are available"
+          site.deploys.each_with_index do |deploy, index|
+            @logger.info "#{index} - #{deploy.created_at}"
+          end
+          @logger.info "To Rollback, type `harpoon rollback {{deploy-number}}`"
+        else
+          @logger.fatal "Uh oh, please run `harpoon doctor`"
+        end
+      end
+
+      def rollback(version)
+        #rollback to {{version}}
+        deploy = site.deploys.all[version.to_i]
+        if deploy
+          @logger.info "Publishing version #{deploy.id} created at #{deploy.created_at}"
+          deploy.publish
+          @logger.pass "Published."
+        end
+      end
+
+      def doctor
+        #check to see if we're ready for a deploy
+        if site
+          @logger.pass "Site configured with BitBalloon"
+        else
+          @logger.fail "Site not configured"
+          @logger.suggest "Run `harpoon setup`"
+          exit
+        end
+
+        if @config[:primary_domain]
+          if site.custom_domain == @config[:primary_domain]
+            @logger.pass "Custom domain configured"
+          else
+            @logger.fail "Custom domain not setup"
+            @logger.suggest "Run `harpoon setup`"
+            exit
+          end
+        end
+
+        @logger.suggest "Make sure you have your DNS settings configured"
+        @logger.suggest "Learn more at https://www.bitballoon.com/docs/custom_domains/"
+      end
+
+      private
+
+      def bitballoon
+        @bitballoon ||= ::BitBalloon::Client.new(:access_token => @auth[:secret])
+      end
+
+      def site
+        return @site if defined? @site
+        bitballoon.sites.each do |s|
+          return @site = s if s.name == @config.name
+        end
+        @logger.fatal "Site could not be found"
+        @logger.suggest "Try running `harpoon doctor`"
+        return nil
+      end
+    end
+  end
+end

data/lib/harpoon/services/s3.rb

@@ -34,7 +34,7 @@ module Harpoon
           bucket.policy = policy
 
 
-          history = setup_bucket(rollback_bucket(@options.primary_domain))
+          history = setup_bucket(rollback_bucket_name(@options.primary_domain))
           @logger.info "Created rollback bucket"
 
           setup_dns_alias(@options.primary_domain, bucket)
@@ -43,7 +43,6 @@ module Harpoon
           if @options.forwarded_domain
             #we also want to forward some domains
             #make sure we have an array
-            #TODO : Move all of this nonsense to the config object, it should be validating this stuff
             forwarded = @options.forwarded_domain.is_a?(Array) ? @options.forwarded_domain : [@options.forwarded_domain]
             forwarded.each do |f|
               bucket = setup_bucket(f)
@@ -61,28 +60,33 @@ module Harpoon
 
       def deploy
         raise Harpoon::Errors::InvalidConfiguration, "Missing list of files" unless @options.files && @options.directory && @options.primary_domain
-        move_existing_to_history!
-        current_bucket = s3.buckets[@options.primary_domain]
-        raise Harpoon::Errors::MissingSetup, "Required s3 buckets are not created.  Run harpoon doctor to test." unless current_bucket.exists?
-        @logger.info "Copying new release to s3"
-        @options.files.each do |f|
-          @logger.debug "Path: #{f}"
-          relative_path = Pathname.new(f).relative_path_from(Pathname.new(@options.directory)).to_s
-          @logger.debug "s3 key: #{relative_path}"
-          current_bucket.objects[relative_path].write(Pathname.new(f))
+        if primary_bucket
+          move_existing_to_history!
+          @logger.info "Copying new release to s3"
+          @options.files.each do |f|
+            @logger.debug "Path: #{f}"
+            relative_path = Pathname.new(f).relative_path_from(Pathname.new(@options.directory)).to_s
+            @logger.debug "s3 key: #{relative_path}"
+            primary_bucket.objects[relative_path].write(Pathname.new(f))
+          end
+          @logger.info "...done"
+        else
+          raise Harpoon::Errors::MissingSetup, "Required s3 buckets are not created.  Run harpoon doctor to test."
         end
-        @logger.info "...done"
       end
 
       def list
         @logger.info "The following rollbacks are available:"
-        if @options.primary_domain
-          tree = s3.buckets[rollback_bucket(@options.primary_domain)].as_tree
+        if rollback_bucket
+          tree = rollback_bucket.as_tree
           rollbacks = tree.children.collect {|i| i.prefix.gsub(/\/$/, "").to_i }
           rollbacks.sort!.reverse!
           rollbacks.each_with_index do |r, index|
             @logger.info Time.at(r).strftime("#{index + 1} - %F %r")
           end
+        else
+          @logger.warn "Rollback bucket not yet created"
+          @logger.suggest "Run harpoon setup to create one"
         end
       end
 
@@ -142,10 +146,15 @@ module Harpoon
         @logger.info "...done"
       end
 
-      def rollback
+      def rollback(version)
         @logger.info "Not yet implemented!"
         @logger.info "Your rollbacks ARE safe on s3 #{rollback_bucket(@options.primary_domain)}"
-        self.list
+        if rollback_bucket && primary_bucket
+          @logger.debug "Rollback bucket found, ensuring version exists"
+        else
+          @logger.warn "Buckets not yet configured"
+          @logger.suggest "Setup a primary domain in your configuration and run harpoon setup"
+        end
       end
 
       private
@@ -235,10 +244,6 @@ module Harpoon
         @logger.suggest "=============================="
       end
 
-      def rollback_bucket(domain)
-        "#{domain}-history"
-      end
-
       def move_existing_to_history!
         raise Harpoon::Errors::InvalidConfiguration, "Must have a primary domain defined" unless @options.primary_domain
         @logger.info "Moving existing deploy to history"
@@ -257,9 +262,31 @@ module Harpoon
         end
         @logger.debug "Moved to history, deleting files from current bucket"
         #delete the current objects
-        current.objects.delete_all
+        bucket.objects.delete_all
         @logger.debug "Files deleted"
       end
+
+      def primary_bucket
+        return @primary_bucket if defined? @primary_bucket
+        if @options.primary_domain && s3.buckets[@options.primary_domain].exists?
+          return @primary_bucket = s3.buckets[@options.primary_domain]
+        else
+          return false
+        end
+      end
+
+      def rollback_bucket
+        return @rollback_bucket if defined? @rollback_bucket
+        if @options.primary_domain && s3.buckets[rollback_bucket_name(@options.primary_domain)].exists?
+          return @rollback_bucket = s3.buckets[rollback_bucket_name(@options.primary_domain)]
+        else
+          return false
+        end
+      end
+
+      def rollback_bucket_name(domain)
+        "#{domain}-history"
+      end
     end
   end
 end

data/lib/harpoon.rb

@@ -10,4 +10,5 @@ module Harpoon
 	require_relative "harpoon/service"
 	require_relative "harpoon/services/test"
 	require_relative "harpoon/services/s3"
+	require_relative "harpoon/services/bitballoon"
 end

data/test/test_logger.rb

@@ -0,0 +1,19 @@
+require "helper"
+
+describe "Logger" do
+  before do
+    @logger = Harpoon::Logger.new(STDOUT)
+  end
+
+  it "Should understand how to record a pass" do
+    assert defined?(@logger.pass), "Should have a pass method"
+  end
+
+  it "Should understand how to record a fail" do
+    assert defined?(@logger.fail), "Should have a fail method"
+  end
+
+  it "Should understand how to record a suggestion" do
+    assert defined?(@logger.suggest), "Should have a suggest method"
+  end
+end

data/test/test_service_base.rb

@@ -27,6 +27,7 @@ describe "Service Base" do
     @mock_auth = MiniTest::Mock.new
     @mock_logger = MiniTest::Mock.new
     d = {
+      name: "test-app",
       hosting: :test,
       hosting_options: {default_option: "one", new_option: true, default_option_required: true}
     }
@@ -49,6 +50,11 @@ describe "Service Base" do
     assert_equal true, @service.instance_eval {@options.new_option}
   end
 
+  it "Should give us access to the root config object" do
+    @service = Harpoon::Services::TestBase.new(@mock_options, @mock_auth, @mock_logger)
+    assert_equal "test-app", @service.instance_eval {@config.name}
+  end
+
   it "Should raise an error if required options aren't included" do
     @mock_options = Harpoon::Config.new({hosting: :test})
     assert_raises Harpoon::Errors::InvalidConfiguration do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harpoon
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ryan Quinn
@@ -15,6 +15,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
@@ -29,6 +35,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.7
   type: :runtime
@@ -36,6 +45,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.7
 - !ruby/object:Gem::Dependency
@@ -43,6 +55,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.51'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.51.0
   type: :runtime
@@ -50,13 +65,39 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.51'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.51.0
+- !ruby/object:Gem::Dependency
+  name: bitballoon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
@@ -64,6 +105,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
@@ -71,6 +115,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :runtime
@@ -78,6 +125,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
@@ -85,6 +135,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.5
   type: :runtime
@@ -92,6 +145,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.5
 description: Deploy small server-less webapps to amazon s3, including buckets, dns
@@ -117,6 +173,7 @@ files:
 - lib/harpoon/logger.rb
 - lib/harpoon/runner.rb
 - lib/harpoon/service.rb
+- lib/harpoon/services/bitballoon.rb
 - lib/harpoon/services/s3.rb
 - lib/harpoon/services/test.rb
 - lib/harpoon/templates/harpoon.json
@@ -133,6 +190,7 @@ files:
 - test/test_directory/unnested_files/nested/test2.txt
 - test/test_directory/unnested_files/test.txt
 - test/test_hosting.rb
+- test/test_logger.rb
 - test/test_runner.rb
 - test/test_service_base.rb
 - test/test_services.rb