skypager 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1255f32a2f558cf91cb1daa447d209759f6b62be
-  data.tar.gz: 0e16117f9435562cdb26e69f5b1fc2481b3e6635
+  metadata.gz: 549d7187a816f502b9db66fa489f87e2c4bcff72
+  data.tar.gz: d6c2388c6c5565f73a86eb0be6c16294f92b7a0f
 SHA512:
-  metadata.gz: 927b6be93828744586b80f58ca22ea43dea43b754dd9bc6296d7127b4ae703aa4555951141af205ecf8d818ffe140168f18b056d958d27e89ab97c0fb42b9951
-  data.tar.gz: bdc5da28ff702873819cf6edc7f5c4340212e28d10dd81ea1b07024ea54dc079b3964b742e3b13d3908b5f77d1d46c096bdd4014a6e0afe7ebcdcbcee4a7aa49
+  metadata.gz: 633189ac4c391ebf5048cd4e597ce94c1c518f23136e3cf0193a06f41b39215f7f42bfe10b66465fe28cb06fe304f94df253441484b26e0f71d932f66dfef587
+  data.tar.gz: 9d589905c390eede65e3dccde8fc36575d83b93cd381afd7109827a8e84204e7fdd2fe27dee744e8d92d541d852aec98bbba4538ace4bda55621b3c7acfd9ace

data/bin/bootstrap.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+export DEBIAN_FRONTEND=noninteractive
+export SKYPAGER_REPO=${SKYPAGER_REPO:-"https://github.com/architects/skypager.git"}
+
+if ! command -v apt-get &>/dev/null
+then
+  echo "This installation script requires apt-get. For manual installation instructions, consult https://github.com/progrium/dokku ."
+  exit 1
+fi
+
+apt-get update
+apt-get install -qq -y git-core curl zlib1g-dev build-essential libssl-dev libreadline-dev libyaml-dev libsqlite3-dev sqlite3 libxml2-dev libxslt1-dev libcurl4-openssl-dev python-software-properties
+apt-get install -qq -y git make curl software-properties-common man-db
+
+cd ~
+git clone git://github.com/sstephenson/rbenv.git .rbenv
+echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
+echo 'eval "$(rbenv init -)"' >> ~/.bashrc
+exec $SHELL
+
+git clone git://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
+echo 'export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.bashrc
+exec $SHELL
+
+rbenv install 2.1.3
+rbenv global 2.1.3
+ruby -v

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

@@ -8,6 +8,8 @@ command 'build' do |c|
 
   c.option "--force", nil, 'Whether or not we should force a build'
 
+  $enable_skypager_sync_from_command = true
+
   c.action do |args, options|
     require 'rack/test'
     require 'skypager/builder'
@@ -46,3 +48,17 @@ command 'run build server' do |c|
 
   end
 end
+
+command 'generate builder crontab' do |c|
+  c.syntax = 'skypager generate builder crontab'
+  c.description = 'generates a crontab which will build sites that are marked to be built'
+
+  c.action do |args, options|
+    lines = Skypager::Site.sites.map do |site|
+      "*/5 * * * * cd #{ site.root } && bundle exec skypager build"
+    end
+
+    puts "== run 'crontab -e' as root and add the following content:\n\n\n"
+    puts lines.join("\n")
+  end
+end

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

@@ -3,11 +3,16 @@ command 'deploy' do |c|
   c.description = 'deploy this site'
 
   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
 
+    if options.full.present?
+      site.remove_build_manifest
+    end
+
     site.deploy(app.build_path)
 
     if site.use_cdn?
@@ -19,9 +24,13 @@ command 'deploy' do |c|
 
       begin
         service = cdn.service
-        puts "Posting CDN Invalidations"
-        puts paths.inspect
-        service.post_invalidation cdn, paths
+
+        puts "== Posting CDN Invalidations"
+        paths.each do |path|
+          puts "==== #{ path }"
+        end
+
+        service.post_invalidation cdn.id, paths
       rescue => e
         puts "Error invalidating the CDN: #{ e.message }"
       end

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

@@ -14,6 +14,13 @@ command 'setup' do |c|
 
     require 'dnsimple'
     Skypager.dns.setup unless options.skip_dns || Skypager.config.dnsimple_setup?
+
+    want_to_setup_deployment = agree("Want to setup deployment right now? This will make your site available in the clouds. type yes/no")
+
+    if want_to_setup_deployment
+      puts "== This might take a minute."
+      Skypager::DeploymentSetup.run(options)
+    end
   end
 end
 
@@ -45,55 +52,7 @@ command 'setup deployment' do |c|
                                  secret_access_key: options.secret_access_key)
 
 
-    app = Skypager.app
-
-    if !Skypager.config.dnsimple_setup?
-      if agree("Do you want to setup DNSimple integration?")
-        Skypager.dns.setup()
-      end
-    end
-
-    custom_domain = app.deploy_options[:custom_domain] || options.custom_domain || ask("Enter a custom domain name to deploy to.  Leave blank if you don't want to use this.")
-
-    if custom_domain.to_s.length > 0
-      app.site.set :custom_domain, custom_domain
-      app.site.set :use_cdn, true
-      @custom_domain = custom_domain
-    end
-
-    unless @custom_domain || app.deploy_options[:use_cdn] == true
-      if agree("Do you want to use a CDN? Answer yes if you want to use a custom domain, or SSL for this site")
-        app.site.set :use_cdn, true
-      end
-    end
-
-    bucket_name = app.deploy_options[:bucket_name] || options.create_bucket || ask("Enter a name for this bucket. Leave blank to use #{ app.site.name }.#{ Skypager.config.domain}")
-    bucket_name = app.site_name + "." + Skypager.config.domain if bucket_name.to_s.length == 0
-
-    if bucket_name
-      if bucket = Skypager.amazon.find_or_create_bucket(bucket_name)
-        app.site.set :bucket_key, bucket.key
-        app.site.set :bucket_name, bucket.key
-      end
-    end
-
-    config_path = Pathname(app.root).join("config.rb")
-    config_text = config_path.read rescue ""
-
-    app.site.after_setup
-
-    unless config_text.match(/deploy_to\(\:amazon/)
-      puts "Adding the following to your config.rb:\n\n\t#{ line = app.site.deploy_options_config_string }"
-      config_path.open("a+") {|fh| fh.write(line) }
-    end
-
-    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?
+    Skypager::DeploymentSetup.run(options)
   end
 end
 
@@ -135,3 +94,60 @@ command 'setup github' do |c|
 end
 
 
+module Skypager
+  class DeploymentSetup
+    def self.run(options)
+      app = Skypager.app
+
+      if !Skypager.config.dnsimple_setup?
+        if agree("Do you want to setup DNSimple integration?")
+          Skypager.dns.setup()
+        end
+      end
+
+      custom_domain = app.deploy_options[:custom_domain] || options.custom_domain || ask("Enter a custom domain name to deploy to.  Leave blank if you don't want to use this.")
+
+      if custom_domain.to_s.length > 0
+        app.site.set :custom_domain, custom_domain
+        app.site.set :use_cdn, true
+        @custom_domain = custom_domain
+      end
+
+      unless @custom_domain || app.deploy_options[:use_cdn] == true
+        if agree("Do you want to use a CDN? Answer yes if you want to use a custom domain, or SSL for this site")
+          app.site.set :use_cdn, true
+        end
+      end
+
+      bucket_name = app.deploy_options[:bucket_name] || options.create_bucket || ask("Enter a name for this bucket. Leave blank to use #{ app.site.name }.#{ Skypager.config.domain}")
+      bucket_name = app.site_name + "." + Skypager.config.domain if bucket_name.to_s.length == 0
+
+      if bucket_name
+        if bucket = Skypager.amazon.find_or_create_bucket(bucket_name)
+          app.site.set :bucket_key, bucket.key
+          app.site.set :bucket_name, bucket.key
+        end
+      end
+
+      config_path = Pathname(app.root).join("config.rb")
+      config_text = config_path.read rescue ""
+
+      app.site.after_setup
+
+      unless config_text.match(/deploy_to\(\:amazon/)
+        puts "Adding the following to your config.rb:\n\n\t#{ line = app.site.deploy_options_config_string }"
+        config_path.open("a+") {|fh| fh.write(line) }
+      end
+
+      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
+end
+
+

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

@@ -1,11 +1,13 @@
 command 'sync' do |c|
   c.action do |args, options|
+    $enable_skypager_sync_from_command = true
+
     app = ::Middleman::Application.server.inst do
       set :environment, 'development'
     end
 
     app.synced_folders.each do |name, folder|
-      puts "Syncing #{ name }"
+      puts "== Syncing #{ name }"
       folder.sync()
     end
 

data/lib/skypager/extension.rb

@@ -26,7 +26,7 @@ module Skypager
         app.set(key, value)
       end
 
-      unless $skypager_command || ENV['DISABLE_SKYPAGER_SYNC']
+      unless ($skypager_command || ENV['DISABLE_SKYPAGER_SYNC']) && !$enable_skypager_sync_from_command
         app.ready do
           sync_folders()
           load_stores()
@@ -36,15 +36,25 @@ module Skypager
         # In development, we will try to refresh remote data stores (e.g. google spreadsheets)
         # before every request once every minute or so
         app.before do
+         if !Skypager.config.dropbox_setup? && !Skypager.config.google_setup? && !Skypager.config.amazon_setup?
+           puts "\n\n== Use Skypager's one time setup script to automate huge parts of your workflow!"
+           puts "Run 'skypager setup' now"
+           puts "\n\n\n"
+           raise 'Run skypager setup first'
+         end
+
           data_sources.values.each do |data_source|
             data_source.refresh_if_stale?
           end if development?
         end
       end
 
+      app.before_configuration do
+      end
+
       app.after_build do
-        app.site.requires_build!(false)
-        app.deploy! if app.auto_deploy?
+        site.requires_build!(false)
+        deploy! if auto_deploy?
       end
 
       app.after_configuration do

data/lib/skypager/site.rb

@@ -192,6 +192,12 @@ module Skypager
     def deploy(build_dir)
       target = bucket || Skypager.amazon.s3_bucket
 
+      if target.to_s.match(/there is no bucket named/i)
+        puts "== The S3 Bucket is not setup for this site."
+        puts "==== Please run 'bundle exec skypager setup deployment' to begin this process"
+        return
+      end
+
       payload = prepare_deploy(build_dir)
 
       if payload.empty?
@@ -199,9 +205,11 @@ module Skypager
       end
 
       payload.each do |hash|
-        if target.files.create(key: hash[:key], body: File.open(hash[:node]), public: true)
+        body = hash[:node].read
+
+        if target.files.create(key: hash[:key], body: body, public: true)
           rel = hash[:key]
-          puts "== Deployed #{rel}"
+          puts "== Deployed #{ body.length } bytes to #{rel}"
           build_manifest[rel] = hash[:digest]
         end
       end
@@ -211,7 +219,11 @@ module Skypager
     end
 
     def use_cdn?
-      get(:use_cdn) == true || get(:use_cdn) == "yes" || get(:use_cdn) == "true"
+      deploy_options.fetch(:custom_domain).to_s.length > 0 || (get(:use_cdn) == true || get(:use_cdn) == "yes" || get(:use_cdn) == "true")
+    end
+
+    def remove_build_manifest
+      set(:build_manifest, @build_manifest = {})
     end
 
     # TODO

data/lib/skypager/sync/folder.rb

@@ -56,8 +56,12 @@ module Skypager
       end
 
       def sync
-        return dropbox_pull if dropbox?
-        return google_sync if google?
+        if dropbox?
+          dropbox_pull
+          dropbox_push_sync
+        elsif google?
+          google_sync
+        end
       end
 
       def dropbox_pull
@@ -67,15 +71,15 @@ module Skypager
           local = matching_local_path_for(entry.path)
 
           if entry.is_deleted
-            puts "Removing #{ local }"
+            puts "== Removing #{ local }"
             local.rmtree if local.exist?
           elsif entry.is_dir == true
             unless local.exist?
-              puts "Creating #{ local } directory"
+              puts "== Creating #{ local } directory"
               local.mkdir
             end
           elsif entry.is_dir == false || entry.is_dir == nil
-            puts "Downloading #{ entry.size } bytes to #{ local }"
+            puts "== Downloading #{ local }"
             local.open('wb+') do |fh|
               fh.write(entry.download)
             end
@@ -90,6 +94,24 @@ module Skypager
         # Implement google drive folder cloning
       end
 
+      def files_map
+        remotes = all_remote_files
+
+        fmap = {}
+
+        if dropbox?
+          all_local_files.each do |e|
+            remote = remotes.find do |x|
+              "#{x[:path]}".match(/#{ e[:path] }$/)
+            end
+
+            fmap[e[:path]] = {local: e, remote: remote}
+          end
+        end
+
+        fmap
+      end
+
       def newer_local_files
         remotes = all_remote_files
 
@@ -189,7 +211,12 @@ module Skypager
         newer_local_files.each do |entry|
           target = "#{ path_prefix }/#{ entry[:path] }"
           target = target.gsub(/^\//,'')
-          api.upload(target, entry[:realpath].read, overwrite: true)
+
+          puts "== Attempting to sync #{ entry[:realpath] } to #{ target }"
+
+          if entry[:realpath].file?
+            api.upload(target, entry[:realpath].read, overwrite: true)
+          end
         end
       end
 

data/lib/skypager/version.rb

@@ -1,3 +1,3 @@
 module Skypager
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

data/skypager.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hashie'
   spec.add_dependency 'commander'
   spec.add_dependency 'fog'
-  spec.add_dependency 'dropbox-api'
+  spec.add_dependency 'dropbox-api', '>= 0.4.3'
   spec.add_dependency 'google_drive'
   spec.add_dependency 'middleman'
   spec.add_dependency 'rack-contrib'
@@ -32,7 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dnsimple-ruby'
   spec.add_dependency 'rack-proxy'
   spec.add_dependency 'octokit', '>= 3.0.0'
-  spec.add_dependency 'whenever'
 
   # If I ever wanted to try and bundle up the build server
   # sweep utility, instead of making it an external cron job

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skypager
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: google_drive
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +206,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: whenever
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
@@ -322,6 +308,7 @@ description: Skypager is for launching your websites
 email:
 - jonathan.soeder@gmail.com
 executables:
+- bootstrap.sh
 - skypager
 extensions: []
 extra_rdoc_files: []
@@ -335,6 +322,7 @@ files:
 - README.md
 - Rakefile
 - VISION.md
+- bin/bootstrap.sh
 - bin/skypager
 - examples/.gitignore
 - examples/blog-site/.gitignore