harpoon 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 937896b519cb54849436445b71d22a9e8d8ba4af
-  data.tar.gz: 7ce38434f4b5d2c80aebe8a11fa1b76d44b8822f
+  metadata.gz: 67816218225a067d3f8b66c9673338f17204fd3d
+  data.tar.gz: 75ba5ab88e915ad54987f0518a620ba4bbeb19b8
 SHA512:
-  metadata.gz: 395c2a001da8362adf10d10cb49d7bda934236f00fdcb733dd09631c9b15987347fa90e5d3323939af42a3d09bde1e515b45cdd0bb08a059aefe68cb45caea3e
-  data.tar.gz: e58b5de1b132b71b25369087264838717fd52443c580ad109ddcfd1e9ddacc6ff7c8e82988a8350616f2e69c824da676c82d4a9f9677f469d423d8b263506f78
+  metadata.gz: 5f61d684a67f40527bc41396e63d3a5115ae2d02ca4677b315890b33cb6202f90ea50bfab68022ab3bd6895ed51ab86fd3574a8a52c3d4fff8005b3c2158e6f3
+  data.tar.gz: d1af82d8c71e92dcdabf854a91cdbc451413dc169f2e4498dfb59f0418aeb768e30fde4bcc560b3ec25f082060b1daac800d4e92f393219afea5e9c65be5a302

data/README.md

@@ -1,4 +1,6 @@
 # Harpoon
-A static site deployer
+A static site deployer, initially targeting Amazon s3
 
-This is a work in progress, not ready for prime time just yet.  Keep your eyes on it though, I'll be releasing it shortly!
+This project is a work in progress, but it's already pretty functional and serves my purposes well.  Feedback/issues/encouragement/complaints are all awesome and appreciated!
+
+Learn more at [www.getharpoon.com](http://www.getharpoon.com).

data/harpoon.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'harpoon'
-  s.version     = '0.0.3'
+  s.version     = '0.0.4'
   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"
@@ -14,5 +14,6 @@ Gem::Specification.new do |s|
   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.homepage    = 'http://www.getharpoon.com'
 end

data/lib/harpoon.rb

@@ -4,8 +4,10 @@ module Harpoon
 	require_relative "harpoon/errors"
 	require_relative "harpoon/config"
 	require_relative "harpoon/runner"
+	require_relative "harpoon/logger"
 
 	# Services
-	require_relative "harpoon/services/test.rb"
-	require_relative "harpoon/services/s3.rb"
+	require_relative "harpoon/service"
+	require_relative "harpoon/services/test"
+	require_relative "harpoon/services/s3"
 end

data/lib/harpoon/config.rb

@@ -1,5 +1,6 @@
 require "json"
 require "fileutils"
+require "active_support/core_ext/hash"
 
 module Harpoon
   class Config
@@ -43,18 +44,60 @@ module Harpoon
       end
     end
 
-    attr_reader :files
-
     # Initialize a new config object with the data loaded
     def initialize(data = {}, logger = nil)
-      @config = data
+      @data = data.symbolize_keys
       @logger = logger
-      @files = Dir.glob(File.join(@config["directory"], "**", "*")).select {|f| !File.directory?(f) && File.basename(f) != "harpoon.json"} if @config["directory"]
+      @required_values = []
+    end
+
+    def files
+      Dir.glob(File.join(@data[:directory], "**", "*")).select {|f| !File.directory?(f) && File.basename(f) != "harpoon.json"} if @data[:directory]
+    end
+
+    def deep_merge!(h1)
+      @data.deep_merge! h1.symbolize_keys
+    end
+
+    def requires(required_value)
+      @required_values.push(required_value.to_sym)
+    end
+
+    def validate!
+      @required_values.each do |r|
+        raise Harpoon::Errors::InvalidConfiguration, "Missing #{r} configuration" if @data[r] == nil
+      end
+    end
+
+    def validate
+      begin
+        validate!
+      rescue Harpoon::Errors::InvalidConfiguration
+        return false
+      else
+        return true
+      end
+    end
+
+    def data
+      @data.dup
+    end
+
+    def dup
+      c = Harpoon::Config.new(self.data)
+      req = @required_values.dup
+      c.instance_eval {@required_values = req}
+      c
     end
 
     # Check for the configuration item
     def method_missing(method, *args)
-      @config[method.to_s]
+      method = method.to_s
+      if method.end_with? "="
+        @data[method.gsub(/=$/, "").to_sym] = args.first
+      else
+        @data[method.to_sym]
+      end
     end
   end
 end

data/lib/harpoon/logger.rb

@@ -0,0 +1,50 @@
+require "logger"
+require "colorize"
+
+module Harpoon
+  class Logger < Logger
+    SEVS = %w(DEBUG INFO WARN ERROR FATAL SUGGEST PASS FAIL)
+    CHECKMARK = "\u2713"
+    ARROW = "\u279C"
+
+    def format_severity(severity)
+      SEVS[severity] || 'ANY'
+    end
+
+    def suggest(message, progname = nil, &block)
+      add(5, message, progname, &block)
+    end
+
+    def pass(message, progname = nil, &block)
+      add(6, message, progname, &block)
+    end
+
+    def fail(message, progname = nil, &block)
+      add(7, message, progname, &block)
+    end
+
+    def format_message(severity, datetime, progname, msg)
+      case severity.to_s.downcase
+      when "debug"
+        "DEBUG: #{msg}\n"
+      when "info"
+        "#{ARROW} #{msg}\n".colorize(:gray)
+      when "warn"
+        "#{msg}\n".colorize(:yellow)
+      when "error"
+        "#{msg}\n".colorize(:orange)
+      when "fatal"
+        "#{msg}\n".colorize(:red)
+      when "pass"
+        "#{CHECKMARK} - #{msg}\n".colorize(:green)
+      when "fail"
+        "X - #{msg}\n".colorize(:red)
+      when "suggest"
+        "! - #{msg}\n".colorize(:blue)
+      else
+        "#{severity} - #{msg}\n"
+      end
+    end
+
+  end
+end

data/lib/harpoon/runner.rb

@@ -7,11 +7,23 @@ module Harpoon
         @logger = load_logger(options[:log_level])
         @config = Harpoon::Config.read(options[:config] || Dir.pwd, @logger)
         @auth = load_auth
-        @service = load_host
+      end
+
+      def doctor
+        #we specify doctor specifically to test the config
+        begin
+          @service = load_host
+        rescue Harpoon::Errors::InvalidConfiguration => e
+          @logger.fail("Invalid configuration - #{e.message}")
+        else
+          @logger.pass("Valid configuration")
+          @service.doctor
+        end
       end
 
       def method_missing(method, *args)
         #don't know about this here, must be for the service
+        @service = load_host
         @service.send(method, *args)
       end
 
@@ -39,7 +51,7 @@ module Harpoon
 
       def load_logger(log_level = "info")
         log_level ||= "info"
-        logger = Logger.new(STDOUT)
+        logger = Harpoon::Logger.new(STDOUT)
 
         #set log level
         case log_level.downcase
@@ -54,25 +66,6 @@ module Harpoon
         when "fatal"
           logger.level = Logger::FATAL
         end
-
-        #set log formatter
-        logger.formatter = proc do |severity, datetime, progname, msg|
-          case severity.to_s.downcase
-          when "debug"
-            "DEBUG: #{msg}\n".colorize(:light_blue)
-          when "info"
-            "#{msg}\n".colorize(:gray)
-          when "warn"
-            "#{msg}\n".colorize(:yellow)
-          when "error"
-            "#{msg}\n".colorize(:orange)
-          when "fatal"
-            "#{msg}\n".colorize(:red)
-          else
-            "#{severity} - #{msg}\n"
-          end
-        end
-
         logger
       end
   end

data/lib/harpoon/service.rb

@@ -0,0 +1,58 @@
+module Harpoon
+  # All services should include this module to work with Harpoon
+  module Service
+
+    #include all the class methods we need
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+
+      def auth(key, help = nil)
+        required_auth.push({identifier: key, help: help})
+      end
+
+      def option(key, *args)
+        args = args.last.is_a?(Hash) ? args.pop : {}
+
+        default_options.send("#{key}=", args[:default]) if args[:default]
+        default_options.requires(key) if args[:required]
+      end
+
+      # Defaults setup by the service
+      # These are overridden by the hosting_options in the configuration
+      # file if they exist
+      def default_options
+        @default_options ||= Harpoon::Config.new
+      end
+
+      # An array of required authentication params
+      # These are provided to services as @auth[:key] values
+      def required_auth
+        @required_auth ||= []
+      end
+    end
+
+    #instance methods
+    def initialize(config, auth, logger)
+      @logger = logger
+      @auth = {}
+      @options = self.class.default_options.dup
+
+      @options.deep_merge!(config.hosting_options || {})
+      #copy over the directory as well
+      @options.directory = config.directory
+
+      @options.validate!
+
+      if self.class.required_auth.length > 0
+        req = self.class.required_auth.map {|h| h[:help]}
+        auth_results = auth.__send__(:get_or_ask, config.hosting, *req)
+        self.class.required_auth.each_with_index do |r, index|
+          @auth[r[:identifier]] = auth_results[index]
+        end
+      end
+    end
+  end
+end

data/lib/harpoon/services/s3.rb

@@ -6,96 +6,78 @@ require "pathname"
 module Harpoon
   module Services
     class S3
-      def initialize(config, auth, logger)
-        # Store what we're given for later
-        @config = config
-        @auth = auth
-        @logger = logger
+      include Harpoon::Service
 
-        # Ask for the users credentials
-        @credentials = @auth.get_or_ask("s3", "Key", "Secret")
+      auth :key, "Key"
+      auth :secret, "Secret"
 
-        if config.hosting_options && config.hosting_options["region"]
-          region = config.hosting_options["region"]
-        else
-          region = "us-west-2"
-        end
-
-        AWS.config(access_key_id: @credentials[0], secret_access_key: @credentials[1], region: region)
-
-        # setup amazon interfaces
-        @s3 = AWS::S3.new
-        @r53 = AWS::Route53.new
-      end
+      option :region, default: "us-west-2"
 
       def setup
-        if @config.domain
-          #we have domain info, so let's make sure it's setup for it
-          if @config.domain["primary"]
-            #primary domain detected, let's make sure it exists
-            bucket = setup_bucket(@config.domain["primary"])
-            #setup bucket to server webpages
-            @logger.info "Setting primary domain as website"
-            bucket.configure_website
-            #setup ACL
-            @logger.info "Setting bucket policy"
-            policy = AWS::S3::Policy.new
-            policy.allow(
-              actions: ['s3:GetObject'],
-              resources: [bucket.objects],
-              principals: :any
-            )
-
-            @logger.debug policy.to_json
-
-            bucket.policy = policy
-
-
-            history = setup_bucket(rollback_bucket(@config.domain["primary"]))
-            @logger.info "Created rollback bucket"
-
-            setup_dns_alias(@config.domain["primary"], bucket)
-
-
-            if @config.domain["forwarded"]
-              #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 = @config.domain["forwarded"].is_a?(Array) ? @config.domain["forwarded"] : [@config.domain["forwarded"]]
-              forwarded.each do |f|
-                bucket = setup_bucket(f)
-                @logger.info "Seting up redirect to primary"
-                cw = AWS::S3::WebsiteConfiguration.new({redirect_all_requests_to: {host_name: @config.domain["primary"]}})
-                bucket.website_configuration = cw
-                setup_dns_alias(f, bucket)
-              end
+        if @options.primary_domain
+          #primary domain detected, let's make sure it exists
+          bucket = setup_bucket(@options.primary_domain)
+          #setup bucket to server webpages
+          @logger.info "Setting primary domain as website"
+          bucket.configure_website
+          #setup ACL
+          @logger.info "Setting bucket policy"
+          policy = AWS::S3::Policy.new
+          policy.allow(
+            actions: ['s3:GetObject'],
+            resources: [bucket.objects],
+            principals: :any
+          )
+
+          @logger.debug policy.to_json
+
+          bucket.policy = policy
+
+
+          history = setup_bucket(rollback_bucket(@options.primary_domain))
+          @logger.info "Created rollback bucket"
+
+          setup_dns_alias(@options.primary_domain, bucket)
+
+
+          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)
+              @logger.info "Seting up redirect to primary"
+              cw = AWS::S3::WebsiteConfiguration.new({redirect_all_requests_to: {host_name: @options.primary_domain}})
+              bucket.website_configuration = cw
+              setup_dns_alias(f, bucket)
             end
-
-            # print out DNS settings
-            print_dns_settings(@config.domain["primary"])
           end
+
+          # print out DNS settings
+          print_dns_settings(@options.primary_domain)
         end
       end
 
       def deploy
-        raise Harpoon::Errors::InvalidConfiguration, "Missing list of files" unless @config.files && @config.directory && @config.domain["primary"]
+        raise Harpoon::Errors::InvalidConfiguration, "Missing list of files" unless @options.files && @options.directory && @options.primary_domain
         move_existing_to_history!
-        current_bucket = @s3.buckets[@config.domain["primary"]]
-        raise Harpoon::Errors::MissingSetup, "Required s3 buckets are not created, consider running harpoon setup first" unless current_bucket.exists?
-        @logger.info "Writing files to s3"
-        @config.files.each do |f|
+        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(@config.directory)).to_s
+          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))
         end
-        @logger.info "Deploy complete"
+        @logger.info "...done"
       end
 
       def list
         @logger.info "The following rollbacks are available:"
-        if @config.domain && @config.domain["primary"]
-          tree = @s3.buckets[rollback_bucket(@config.domain["primary"])].as_tree
+        if @options.primary_domain
+          tree = s3.buckets[rollback_bucket(@options.primary_domain)].as_tree
           rollbacks = tree.children.collect {|i| i.prefix.gsub(/\/$/, "").to_i }
           rollbacks.sort!.reverse!
           rollbacks.each_with_index do |r, index|
@@ -105,39 +87,77 @@ module Harpoon
       end
 
       def doctor
+        @logger.pass "Region: #{@options.region}"
         # check configuration
-        if @config.domain
-          if @config.domain["primary"]
-            @logger.info "Primary Domain: #{@config.domain["primary"]}"
-          else
-            @logger.fatal "Missing Primary Domain"
-            exit
-          end
+        if @options.primary_domain
+          @logger.pass "Primary Domain: #{@options.primary_domain}"
         else
-          @logger.fatal "Missing Domain Configuration"
+          @logger.fail "Missing Primary Domain"
           exit
         end
+
+        if @options.forwarded_domain
+          @logger.pass "Forwarded Domains: #{@options.forwarded_domain}"
+        else
+          @logger.pass "No forwarded domains"
+        end
+
         # check IAM permissions
-        # check buckets exist
-        primary_bucket = @s3.buckets[@config.domain["primary"]]
+
+        # check buckets exist and permissions
+        primary_bucket = s3.buckets[@options.primary_domain]
         if primary_bucket.exists?
-          @logger.info "Primary bucket exists"
+          @logger.pass "Primary bucket exists"
         else
-          @logger.fatal "Missing Primary domain bucket"
+          @logger.fail "Missing Primary domain bucket"
         end
+
+        if @options.forwarded_domain
+          forwarded = @options.forwarded_domain.is_a?(Array) ? @options.forwarded_domain : [@options.forwarded_domain]
+          forwarded.each do |f|
+            bucket = s3.buckets[f]
+            if bucket.exists?
+              @logger.pass "Forwarded bucket exists: #{f}"
+              #check forwarding
+              wc = bucket.website_configuration.to_hash
+              @logger.debug "Website Configuration: #{wc}"
+              if wc && wc[:redirect_all_requests_to] && wc[:redirect_all_requests_to][:host_name] == @options.primary_domain
+                @logger.pass "Forwarding setup: #{f}"
+              else
+                @logger.fail "Forwarding needs to be setup: #{f}"
+                @logger.suggest "Run `harpoon setup`"
+              end
+            else
+              @logger.fail "Forwarded bucket doesn't exist: #{f}"
+              @logger.suggest "Run `harpoon setup`"
+            end
+          end
+        end
+
         # check domain setup
+
+
         # print DNS settings
-        print_dns_settings(@config.domain["primary"])
+        print_dns_settings(@options.primary_domain)
+        @logger.info "...done"
       end
 
       def rollback
         @logger.info "Not yet implemented!"
-        @logger.info "But don't worry, your rollbacks are safely stored in #{rollback_bucket(@config.domain["primary"])}"
+        @logger.info "Your rollbacks ARE safe on s3 #{rollback_bucket(@options.primary_domain)}"
         self.list
       end
 
       private
 
+      def s3
+        @s3 ||= AWS::S3.new({access_key_id: @auth[:key], secret_access_key: @auth[:secret], region: @options.region})
+      end
+
+      def r53
+        @r53 ||= AWS::Route53.new({access_key_id: @auth[:key], secret_access_key: @auth[:secret], region: @options.region})
+      end
+
       def setup_dns_alias(domain, bucket)
         @logger.debug "Setup Domain Alias for #{domain}"
         #extract root domain
@@ -151,8 +171,8 @@ module Harpoon
 
 
         #ensure we have a hosted zone
-        hosted_zone = @r53.hosted_zones.find {|h| h.name == rdomain}
-        hosted_zone = @r53.hosted_zones.create(rdomain, {comment: "Created By Harpoon"}) if !hosted_zone
+        hosted_zone = r53.hosted_zones.find {|h| h.name == rdomain}
+        hosted_zone = r53.hosted_zones.create(rdomain, {comment: "Created By Harpoon"}) if !hosted_zone
 
         record = hosted_zone.rrsets[domain, "A"]
 
@@ -165,9 +185,9 @@ module Harpoon
 
       def setup_bucket(bucket_name)
         @logger.info "Creating bucket: #{bucket_name}"
-        bucket = @s3.buckets[bucket_name]
+        bucket = s3.buckets[bucket_name]
         unless bucket.exists?
-          bucket = @s3.buckets.create(bucket_name)
+          bucket = s3.buckets.create(bucket_name)
         end
         bucket
       end
@@ -206,13 +226,13 @@ module Harpoon
         @logger.debug "Print DNS Settings for: #{domain}"
         rdomain = "#{root_domain(domain)}."
         @logger.debug "Root Domain: #{rdomain}"
-        @logger.warn "=============================="
-        @logger.warn "Please forward to the following DNS:"
-        hosted_zone = @r53.hosted_zones.find {|h| h.name == rdomain}
+        @logger.suggest "=============================="
+        @logger.suggest "Please transfer domain to Amazon Nameservers:"
+        hosted_zone = r53.hosted_zones.find {|h| h.name == rdomain}
         hosted_zone.rrsets[rdomain, "NS"].resource_records.each do |r|
-          @logger.warn r[:value]
+          @logger.suggest r[:value]
         end
-        @logger.warn "=============================="
+        @logger.suggest "=============================="
       end
 
       def rollback_bucket(domain)
@@ -220,10 +240,10 @@ module Harpoon
       end
 
       def move_existing_to_history!
-        raise Harpoon::Errors::InvalidConfiguration, "Must have a primary domain defined" unless @config.domain["primary"]
+        raise Harpoon::Errors::InvalidConfiguration, "Must have a primary domain defined" unless @options.primary_domain
         @logger.info "Moving existing deploy to history"
-        current = @s3.buckets[@config.domain["primary"]]
-        history = @s3.buckets[rollback_bucket(@config.domain["primary"])]
+        current = s3.buckets[@options.primary_domain]
+        history = s3.buckets[rollback_bucket(@options.primary_domain)]
         raise Harpoon::Errors::MissingSetup, "The expected buckets are not yet created, please try running harpoon setup" unless current.exists? && history.exists?
 
         current_date = Time.now.to_i

data/lib/harpoon/services/test.rb

@@ -1,16 +1,17 @@
 module Harpoon
 	module Services
 		class Test
+			include Harpoon::Service
 			attr_accessor :config, :requests
 
 			def initialize(config = nil, auth = nil, logger = nil)
-				@auth = auth
 				@config = config
-				@requests = []
+				@auth = auth
 				@logger = logger
 			end
 
 			def method_missing(method, *args)
+				@requests ||= []
 				@requests.push [method, args]
 			end
 		end

data/lib/harpoon/templates/harpoon.json

@@ -3,11 +3,9 @@
   "hosting" : "s3",
   "auth_namespace" : "main",
   "hosting_options" : {
+    "primary_domain": "www.domain.com",
+    "forwarded_domain" : ["domain.com"],
     "region" : "us-west-2"
   },
-  "domain" : {
-    "primary" : "www.domain.com",
-    "forwarded" : ["domain.com"]
-  },
   "directory" : ""
 }

data/test/test_config.rb

@@ -57,4 +57,53 @@ describe "Config File" do
     assert_equal 2, unnested.files.length, "Should have found 2 files"
     assert_equal [File.join(Dir.pwd, "test", "test_directory", "unnested_files", "nested", "test2.txt"), File.join(Dir.pwd, "test", "test_directory", "unnested_files", "test.txt")], unnested.files, "Should have found the right files"
   end
+
+  it "Should provide some deep merge functionality" do
+    h1 = { x: { y: [4,5,6] }, z: [7,8,9] }
+    h2 = { x: { y: [7,8,9] }, z: "xyz" }
+
+    c1 = Harpoon::Config.new(h1.dup)
+    c2 = Harpoon::Config.new(h2.dup)
+
+    assert_equal ({ x: { y: [7, 8, 9] }, z: "xyz" }), c1.deep_merge!(h2)
+    assert_equal ({ x: { y: [4, 5, 6] }, z: [7, 8, 9] }), c2.deep_merge!(h1)
+  end
+
+  it "Should let you get to all the data" do
+    d = {key: "value", key2: "value2"}
+    c1 = Harpoon::Config.new(d)
+    assert_equal d, c1.data, "Should have returned data"
+  end
+
+  it "Should let you require data and then check to confirm you have it" do
+    c1 = Harpoon::Config.new
+    c1.requires :required_1
+    assert_raises Harpoon::Errors::InvalidConfiguration do
+      c1.validate!
+    end
+
+    assert_equal false, c1.validate, "Should have a silent validation as well"
+  end
+
+  it "Should let you set values" do
+    c1 = Harpoon::Config.new
+    c1.test_value = true
+    assert_equal true, c1.test_value, "Should have set the value"
+  end
+
+  it "shouldn't care about strings and symbols" do
+    c1 = Harpoon::Config.new({hosting_options: true})
+    c1.requires :hosting_options
+    assert_equal true, c1.validate, "Should have caught it"
+
+    assert_equal true, c1.hosting_options, "Should have found it!"
+  end
+
+  it "Should have a working dup method" do
+    c1 = Harpoon::Config.new({hosting: true})
+    c2 = c1.dup
+    c1.new_value = true
+    assert !c2.new_value, "Shouldn't have a new value in c2"
+  end
+
 end

data/test/test_directory/nested_files/harpoon.json

@@ -3,11 +3,9 @@
   "hosting" : "s3",
   "auth_namespace" : "main",
   "hosting_options" : {
-    "region" : "US Standard"
-  },
-  "domain" : {
-    "primary" : "www.domain.com",
-    "forwarded" : ["domain.com"]
+    "region" : "US Standard",
+    "primary_domain" : "www.domain.com",
+    "forwarded_domain" : ["domain.com"]
   },
   "directory" : "nested/directory"
 }

data/test/test_directory/test_client/harpoon.json

@@ -3,11 +3,9 @@
   "hosting" : "test",
   "auth_namespace" : "test-namespace",
   "hosting_options" : {
-    "option" : "value"
-  },
-  "domain": {
-    "primary" : "www.domain.com",
-    "forwarded" : ["domain.com"]
+    "option" : "value",
+    "primary_domain" : "www.domain.com",
+    "forwarded_domain" : ["domain.com"]
   },
   "directory" : ""
 }

data/test/test_directory/unnested_files/harpoon.json

@@ -3,10 +3,8 @@
   "hosting" : "s3",
   "auth_namespace" : "main",
   "hosting_options" : {
-    "region" : "US Standard"
-  },
-  "domain" : {
-    "primary" : "www.domain.com",
-    "forwarded" : ["domain.com"]
+    "region" : "us-west-2",
+    "primary_domain" : "www.domain.com",
+    "forwarded_domain" : ["domain.com"]
   }
 }

data/test/test_hosting.rb

@@ -2,7 +2,7 @@ require "helper"
 
 describe "Test Hosting Module" do
 	before do
-		@hosting = Harpoon::Services::Test.new
+		@hosting = Harpoon::Services::Test.new(Object.new, Object.new, Object.new)
 	end
 
 	it "Should let me make requests" do
@@ -10,5 +10,5 @@ describe "Test Hosting Module" do
 		assert_equal :deploy, @hosting.requests[0][0]
 		assert_equal ["options", "go", "here"], @hosting.requests[0][1]
 	end
-	
+
 end

data/test/test_runner.rb

@@ -2,6 +2,7 @@ require "helper"
 describe "Runner" do
   before do
     @runner = Harpoon::Runner.new({config: "test/test_directory/test_client"})
+    @runner.instance_eval {@service = load_host}
   end
 
   it "Should load the config from the config option" do
@@ -16,19 +17,14 @@ describe "Runner" do
     assert_equal "test-namespace", @runner.instance_eval {@auth.namespace}, "Should have set the namespace correctly"
   end
 
-  it "Should be passing in the configuration and auth to the service" do
-    assert_equal @runner.instance_eval {@auth}, @runner.instance_eval {@service.instance_eval {@auth}}, "Should have gotten the right auth"
-    assert_equal @runner.instance_eval {@config}, @runner.instance_eval {@service.instance_eval {@config}}, "Should have gotten the right config"
-  end
-
   it "Should pass any unknown commands to the service" do
     @runner.deploy
     assert_equal :deploy, @runner.instance_eval {@service.requests[0][0]}, "Should have run deploy on the service"
   end
 
   it "Should pass a default logger to everyone" do
-    assert_equal Logger, @runner.instance_eval {@service.instance_eval {@logger.class}}, "Should have passed a logger to the service"
-    assert_equal Logger, @runner.instance_eval {@auth.instance_eval {@logger.class}}, "Should have passed a logger to the auth"
-    assert_equal Logger, @runner.instance_eval {@config.instance_eval {@logger.class}}, "Should have passed a logger to the config"
+    assert_equal Harpoon::Logger, @runner.instance_eval {@service.instance_eval {@logger.class}}, "Should have passed a logger to the service"
+    assert_equal Harpoon::Logger, @runner.instance_eval {@auth.instance_eval {@logger.class}}, "Should have passed a logger to the auth"
+    assert_equal Harpoon::Logger, @runner.instance_eval {@config.instance_eval {@logger.class}}, "Should have passed a logger to the config"
   end
 end

data/test/test_service_base.rb

@@ -0,0 +1,58 @@
+require "helper"
+
+#overwrite test service for this test
+module Harpoon
+  module Services
+    class TestBase
+      include Harpoon::Service
+      attr_accessor :config, :requests
+
+      auth :auth1, "Auth1"
+      auth :auth2, "Auth2"
+
+      option :default_option, default: true
+      option :default_option_2, default: true
+      option :default_option_required, required: true
+
+      def method_missing(method, *args)
+        @requests ||= []
+        @requests.push [method, args]
+      end
+    end
+  end
+end
+
+describe "Service Base" do
+  before do
+    @mock_auth = MiniTest::Mock.new
+    @mock_logger = MiniTest::Mock.new
+    d = {
+      hosting: :test,
+      hosting_options: {default_option: "one", new_option: true, default_option_required: true}
+    }
+    @mock_options = Harpoon::Config.new(d)
+
+    @mock_auth.expect :get_or_ask, ["asdf", "asdf2"], [Symbol, String, String]
+  end
+
+  it "Should request and verify authentication" do
+    @service = Harpoon::Services::TestBase.new(@mock_options, @mock_auth, @mock_logger)
+    @mock_auth.verify
+    assert_equal "asdf", @service.instance_eval {@auth[:auth1]}, "Should have stored auth1 correctly"
+    assert_equal "asdf2", @service.instance_eval {@auth[:auth2]}, "Should have stored auth2 correctly"
+  end
+
+  it "Should have merged in the hosting options with default values" do
+    @service = Harpoon::Services::TestBase.new(@mock_options, @mock_auth, @mock_logger)
+    assert_equal "one", @service.instance_eval {@options.default_option}
+    assert_equal true, @service.instance_eval {@options.default_option_2}
+    assert_equal true, @service.instance_eval {@options.new_option}
+  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
+      @service = Harpoon::Services::TestBase.new(@mock_options, @mock_auth, @mock_logger)
+    end
+  end
+end

data/test/test_services.rb

@@ -7,6 +7,7 @@ describe "Test all services" do
 		# functions
 		Harpoon::Services.constants.each do |c|
 			next if c.to_s == "Test" #skip the test
+			next if c.to_s == "TestBase" #skip base test
 			m = Kernel.const_get("Harpoon").const_get("Services").const_get(c).instance_methods
 			assert_includes m, :deploy, "Should include a deploy method"
 			assert_includes m, :doctor, "Should include a doctor method"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harpoon
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryan Quinn
@@ -14,72 +14,86 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.51.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.51.0
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.5
 description: Deploy small server-less webapps to amazon s3, including buckets, dns
   and permissions
 email: ryan@mazondo.com
@@ -88,7 +102,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - LICENSE.md
 - README.md
 - Rakefile
@@ -100,7 +114,9 @@ files:
 - lib/harpoon/client.rb
 - lib/harpoon/config.rb
 - lib/harpoon/errors.rb
+- lib/harpoon/logger.rb
 - lib/harpoon/runner.rb
+- lib/harpoon/service.rb
 - lib/harpoon/services/s3.rb
 - lib/harpoon/services/test.rb
 - lib/harpoon/templates/harpoon.json
@@ -118,6 +134,7 @@ files:
 - test/test_directory/unnested_files/test.txt
 - test/test_hosting.rb
 - test/test_runner.rb
+- test/test_service_base.rb
 - test/test_services.rb
 homepage: http://www.getharpoon.com
 licenses:
@@ -129,17 +146,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A single page app deployer for amazon s3