skypager 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 984b19714ab85d3529b5fde69301e7c3e39c38f1
-  data.tar.gz: 4aaec7c874f1775de6ccccabcdb9fabaee4ea23f
+  metadata.gz: 98c87935f39c09753e202717a0834fb5758aab8e
+  data.tar.gz: 41896a5735a47f7e40740cbd280005e424216cf7
 SHA512:
-  metadata.gz: 9b46f49ffd6b585be6cc99b0e9500af38f83f356f39e14110fa7f3b2443fc39795c4617db2e3fa9cc46a4267113d50420637acc2a14ffd665c24c62c6a8c59d2
-  data.tar.gz: 29438b7fae153b509d13f7ec0debf2728bdcbd10099bd7c183889e3c13b9ab057d1c0ede0bdcaec9ab2c59959d8b23c055c546e12671e0e5dfc66525273f5cbb
+  metadata.gz: 0c718aa2daa482d9857251dce6565cc9660795f4667571f723e2fd76e251d1a8afbe5b8eb8af976dfeda3788f69be881e274273fdfd9c5510897db461ced7607
+  data.tar.gz: 1f5812373a97ec78b53b63a1ee369a59b245e7b7e88490befea11637a3365b3cc154316ffa057cde394f11beaba3c74f4b656c4207d27fc32004fb9f6879fab7

data/lib/skypager/builder/server.rb

@@ -48,12 +48,19 @@ module Skypager
         end
       end
 
+      def respond_to_directory_request(request)
+        [200, {}, [{type:"directory"}.to_json]]
+      end
+
       def respond_to(request)
         puts "== Responding to: #{ request.path }"
         case
         when request.path.match(/hooks/)
           puts "== Found hooks path"
           respond_to_webhook(request)
+        when request.path.match(/directory/)
+          puts "== Found directory path"
+          respond_to_directory_request(request)
         else
           [404, {}, [""]]
         end

data/lib/skypager/cli/commands/deploy.rb

@@ -1,3 +1,22 @@
+command 'show deploy info' do |c|
+  c.syntax = 'skypager show deploy info'
+  c.description = 'display info about where this site will be deployed'
+
+  c.option '--verbose', nil, 'Display verbose status information'
+  c.option '--full', nil, 'Ignore the build manifest, deploy everything'
+
+  c.action do |args, options|
+    app = Skypager.app
+    site = app.site
+
+    puts "== Site Info:"
+    puts "==== Bucket Name: #{ site.bucket_name }"
+    puts "==== Bucket URL: #{ site.bucket_url }"
+    puts "==== CDN URL: #{ site.cname_value }" if site.has_cdn?
+    puts "==== Custom Domain: #{ site.custom_domain }" if site.custom_domain?
+
+  end
+end
 command 'deploy' do |c|
   c.syntax = 'skypager deploy [options]'
   c.description = 'deploy this site'
@@ -22,6 +41,10 @@ command 'deploy' do |c|
         "/#{ resource.request_path }"
       end
 
+      paths << "/"
+
+      paths.uniq!
+
       begin
         service = cdn.service
 

data/lib/skypager/configuration.rb

@@ -111,10 +111,21 @@ module Skypager
       DefaultSettings.dup
     end
 
-    def current
-      @current ||= begin
-                    defaults.merge(home_config.merge(cwd_config.merge(applied_config))).to_mash
-                   end
+    def current(using_environment = true)
+      @current ||= calculate_config(using_environment)
+    end
+
+    def calculate_config(using_environment = true)
+      @current = defaults.merge(home_config.merge(cwd_config.merge(applied_config))).to_mash
+
+      (defaults.keys + home_config.keys + cwd_config.keys).uniq.each do |key|
+        upper = key.to_s.upcase
+        if ENV[upper]
+          @current[key] = ENV[upper]
+        end
+      end if using_environment
+
+      @current
     end
 
     def apply_config(hash={})

data/lib/skypager/data/google_spreadsheet.rb

@@ -152,6 +152,8 @@ module Skypager
       def last_updated_at
         if value = spreadsheet.document_feed_entry_internal.css('updated').try(:text) rescue nil
           DateTime.parse(value).to_i
+        else
+          Time.now.to_i
         end
       end
 

data/lib/skypager/site.rb

@@ -56,7 +56,9 @@ module Skypager
       @options  = options
       @config   = options.delete(:config)
       @config   ||= self.class.directory[@name] ||= {name: @name}
-      @config = @config.to_mash if @config.is_a?(Hash)
+      @config   = @config.to_mash if @config.is_a?(Hash)
+
+      @config.reverse_merge!(options[:deploy_options]) if options[:deploy_options]
     end
 
     def build_command
@@ -134,7 +136,7 @@ module Skypager
 
     def deploy_options
       options.fetch(:deploy_options) do
-        config.deploy_options || {}
+        (config.deploy_options || {}).to_mash
       end
     end
 
@@ -285,7 +287,7 @@ module Skypager
     end
 
     def custom_domain?
-      get!(:custom_domain)
+      "#{get!(:custom_domain) || deploy_options.custom_domain}".to_s.length > 0
     end
 
     def deploy_options_config_string
@@ -314,8 +316,9 @@ module Skypager
     end
 
     def custom_domain
-      value = get(:custom_domain).to_s
-      value if value.length > 0
+      value = get!(:custom_domain)
+      value = deploy_options.custom_domain if value.nil? || value.to_s.length > 0
+      value
     end
 
     def fetch(key, &block)

data/lib/skypager/version.rb

@@ -1,3 +1,3 @@
 module Skypager
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/skypager.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
     
   spec.add_dependency 'hashie'
-  spec.add_dependency 'commander'
+  spec.add_dependency 'commander', '~> 4.2'
   spec.add_dependency 'fog'
   spec.add_dependency 'dropbox-api', '>= 0.4.3'
   spec.add_dependency 'google_drive'
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   # spec.add_dependency 'spawnling', '~> 2.1.5'
   # spec.add_dependency 'eventmachine'
 
-  spec.add_dependency "aws-sdk-core", "2.0.0.rc8"
+  #spec.add_dependency "aws-sdk-core", "2.0.0.rc8"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", '~> 0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skypager
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -28,16 +28,16 @@ dependencies:
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +206,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.0.rc8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.0.rc8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement