skypager 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44155d615f49ea9e020680ca9266808b140af807
-  data.tar.gz: f1fe669366528dafe9146ad148d2eaa4390ed5d7
+  metadata.gz: 8fdebf82d4d5031dfdf82352c7091bf9df790165
+  data.tar.gz: e4f66b628588875edb0a602c22663706d6230dcf
 SHA512:
-  metadata.gz: e5e7ce919667cc0fcb254f52e9075d79020c918a8e126becf33b4f6b673e6966a559c331cc2333f929c1fd57824e1cbd08fdb2f0a8c720938c57ad282993f80c
-  data.tar.gz: feae4c5ee376cc9482c2cccf7cb3648482072f681b36e7fe70eb528e5ef6d89defebb71f40b325873c7fe93f5299ea586f2084acb72ca782b53f7e15183da226
+  metadata.gz: dff7a44cc2eb0186a3c347bca552b53b13c00312a2ab66f58ade419305da435422319e753c007aa14a5153a214b76bd566ab1af7c23f6e95089f0c29df3566b2
+  data.tar.gz: d99b5f5b87248dfe1e806a375210f496ee3663ec806468be5358c12e94761ca5db37e203c0bd73a5d30d1dcaaa779a1a1d19326c66c6ae83118dced6619bae8c

data/Rakefile

@@ -8,14 +8,3 @@ rescue LoadError
 end
 
 Bundler::GemHelper.install_tasks
-
-Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-desc "Run all specs in spec directory (excluding plugin specs)"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/bin/skypager

@@ -1,17 +1,23 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__),'..','lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib')
 
-require 'bundler'
-Bundler.require(:default, :development)
+require "rubygems"
+require "pry"
+require "commander/import"
 
-require 'commander/import'
+require 'skypager'
+require 'skypager/cli'
 
-program :name, "Skypager"
-program :description, "Skypager is a website launching toolkit"
-program :version, "0.0.1"
+$terminal.wrap_at = 120
 
-require 'skypager'
+begin
+  program :name, 'Skypager'
+  program :version, Skypager::VERSION
+  program :description, 'Skypager is a website launching toolkit'
 
-$skypager_command = true
-Skypager.load_commands()
+  Skypager::Cli.load_commands()
+rescue
+  puts "Error loading the Skypager Commands"
+  puts $!
+end

data/lib/skypager.rb

@@ -2,27 +2,15 @@ $LOAD_PATH.unshift File.dirname(__FILE__)
 
 require 'hashie'
 require 'pathname'
-require 'google_drive'
-require 'google/api_client'
-require 'google_drive/session'
-require 'dropbox-api'
 require 'cgi'
-require 'launchy'
-require 'active_support/core_ext'
 require 'uri_template'
 
 require 'skypager/version'
 require 'skypager/configuration'
 require 'skypager/core_ext'
+require 'active_support/core_ext/string'
 
 module Skypager
-  def self.app(environment="build", &block)
-    @app ||= ::Middleman::Application.server.inst do
-      set :environment, environment
-      instance_eval(&block) unless block.nil?
-    end
-  end
-
   def self.router(app, options={})
     @router ||= Skypager::Router.new(app, options)
   end
@@ -47,29 +35,6 @@ module Skypager
     Skypager::Site.directory
   end
 
-  def self.amazon
-    Skypager::Sync::Amazon.client
-  end
-
-  def self.google
-    Skypager::Sync::Google.client
-  end
-
-  def self.dropbox
-    Skypager::Sync::Dropbox.client
-  end
-
-  def self.github
-    require 'octokit' unless defined?(Octokit)
-    Skypager::Sync::Github.client
-  end
-
-  def self.dns
-    require 'dnsimple'
-    require 'skypager/dns'
-    Skypager::DNS::Manager.client
-  end
-
   def self.root
     Skypager::Configuration.skypager_root
   end
@@ -77,39 +42,6 @@ module Skypager
   def self.lib
     Pathname(File.dirname(__FILE__))
   end
-
-  def self.load_commands
-    Dir["#{lib.join('skypager','cli', 'commands')}/**/*.rb"].each {|f| require(f) }
-  end
-
-  def self.append_config line, options={}
-    file = Pathname(app.root).join('config.rb')
-
-    if file.exist?
-      file.open("a+") do |fh|
-        unless options[:silent]
-          puts "Appending\n\t#{line}"
-        end
-
-        fh.write("\n#{line}")
-      end
-    end
-  end
 end
 
 require 'skypager/site'
-require 'skypager/data'
-require 'skypager/data/source'
-require 'skypager/data/request'
-require 'skypager/data/google_spreadsheet'
-require 'skypager/data/excel_spreadsheet'
-require 'skypager/data/source_routes_proxy'
-require 'skypager/sync'
-require 'skypager/sync/dropbox'
-require 'skypager/sync/dropbox/delta'
-require 'skypager/sync/google'
-require 'skypager/sync/folder'
-require 'skypager/sync/amazon'
-require 'skypager/sync/github'
-require 'skypager/dns'
-require 'skypager/extension'

data/lib/skypager/cli.rb

@@ -0,0 +1,14 @@
+require 'launchy'
+
+module Skypager
+  module Cli
+    def self.load_commands(from_path=nil)
+      from_path ||= Skypager.lib.join("skypager","cli")
+      Dir[from_path.join("**/*.rb")].each {|f| require(f) }
+    end
+
+    def self.accepts_keys_for(c, *services)
+      services.map!(&:to_sym)
+    end
+  end
+end

data/lib/skypager/cli/01_extensions.rb

@@ -0,0 +1,25 @@
+class Commander::Command
+  def action(*args, &block)
+
+    wrapper = lambda do |a, options|
+      if options.config
+        read = Pathname(options.config).read
+        json = JSON.parse(read)
+
+        #Skypager.config.apply_all(json)
+      end
+
+      #Skypager.config.apply_all(options.to_hash)
+
+      block.call(a, options)
+    end
+
+    send(:when_called, *args, &wrapper)
+  end
+
+  class Options
+    def to_hash
+      __hash__
+    end
+  end
+end

data/lib/skypager/cli/config.rb

@@ -0,0 +1,41 @@
+command 'config' do |c|
+  c.syntax = "skypager config [OPTIONS]"
+  c.description = "Shows the configuration options being used"
+
+  c.option '--env', "Output compatible with .env files"
+
+  c.action do |args, options|
+    Skypager.config.current.to_hash.each do |key, value|
+      if options.env
+        puts "#{ key.to_s.upcase }= '#{ value }'"
+      else
+        puts "#{key}: #{value}"
+      end
+    end
+  end
+end
+
+command 'config set' do |c|
+  c.syntax = 'skypager config set KEY=VALUE KEY=VALUE [options]'
+  c.description = 'manipulate configuration settings'
+
+  c.option '--global', 'Set the configuration globally'
+  c.option '--local', 'Set the configuration globally'
+
+  c.example "set a bunch of config parameters", "skypager config set DROPBOX_APP_KEY=xxx DROPBOX_APP_SECRET=yyy GITHUB_APP_SECRET=zzz"
+
+  c.action do |args, _options|
+    Skypager::Configuration.initialize!
+
+    args.select { |pair| pair.match(/=/) }
+      .map { |pair| pair.split('=') }
+      .each do |group|
+        key, value = group
+        Skypager.config.set(key, value, false, global: !!(_options.global))
+      end
+
+    Skypager.config.save!
+
+    Skypager.config.show
+  end
+end

data/lib/skypager/proxy.rb

@@ -51,16 +51,6 @@ module Skypager
       path = key.without_leading_slash
       last = path.split("/").last
 
-      unless options[:directory_indexes] == false
-        # this just feels wrong, but i know it
-        # will work with middleman's directory indexes
-        if path.match(/\/$/)
-          path = "#{path}index.html"
-        elsif !last.match(/\.\w+$/)
-          path = "#{path}/index.html"
-        end
-      end
-
       req = {bucket: bucket, key: path}
 
       req[:key]                   = "index.html" if req[:key].to_s.length == 0

data/lib/skypager/version.rb

@@ -1,3 +1,3 @@
 module Skypager
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/skypager.gemspec

@@ -20,25 +20,11 @@ Gem::Specification.new do |spec|
     
   spec.add_dependency 'hashie'
   spec.add_dependency 'commander', '>= 4.2.1'
-  spec.add_dependency 'fog'
-  spec.add_dependency 'dropbox-api', '>= 0.4.3'
-  spec.add_dependency 'google_drive'
-  spec.add_dependency 'middleman'
   spec.add_dependency 'rack-contrib'
   spec.add_dependency 'launchy'
-  spec.add_dependency 'activesupport', '>= 4.0.0'
-  spec.add_dependency 'axlsx'
+  spec.add_dependency 'activesupport', '>= 3.0.0'
   spec.add_dependency 'uri_template'
-  spec.add_dependency 'dnsimple-ruby'
   spec.add_dependency 'rack-proxy'
-  spec.add_dependency 'octokit', '>= 3.0.0'
-
-  # If I ever wanted to try and bundle up the build server
-  # sweep utility, instead of making it an external cron job
-  # spec.add_dependency 'spawnling', '~> 2.1.5'
-  # spec.add_dependency 'eventmachine'
-
-  #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.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Soeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -38,62 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
-- !ruby/object:Gem::Dependency
-  name: fog
-  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: dropbox-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.3
-- !ruby/object:Gem::Dependency
-  name: google_drive
-  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: middleman
-  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: rack-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: axlsx
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: uri_template
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dnsimple-ruby
-  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: rack-proxy
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: octokit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -294,119 +196,31 @@ description: Skypager is for launching your websites
 email:
 - jonathan.soeder@gmail.com
 executables:
-- bootstrap.sh
 - skypager
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ARCHITECTURE.md
-- CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
-- LICENSE.txt
 - README.md
 - Rakefile
 - VISION.md
-- bin/bootstrap.sh
 - bin/skypager
-- examples/.gitignore
-- examples/blog-site/.gitignore
-- examples/blog-site/.pryrc
-- examples/blog-site/Gemfile
-- examples/blog-site/config.rb
-- examples/blog-site/data/dropbox.json
-- examples/blog-site/source/images/background.png
-- examples/blog-site/source/images/middleman.png
-- examples/blog-site/source/index.html.erb
-- examples/blog-site/source/javascripts/all.js
-- examples/blog-site/source/layouts/layout.erb
-- examples/blog-site/source/posts/introduction-to-skypager.html.md
-- examples/blog-site/source/posts/skypager-and-dnsimple-and-amazon-web-services-combo.html.md
-- examples/blog-site/source/stylesheets/all.css
-- examples/blog-site/source/stylesheets/normalize.css
-- examples/gallery-site/.gitignore
-- examples/gallery-site/.pryrc
-- examples/gallery-site/Gemfile
-- examples/gallery-site/config.rb
-- examples/gallery-site/data/dropbox.json
-- examples/gallery-site/data/galleries.json
-- examples/gallery-site/source/gallery.html.erb
-- examples/gallery-site/source/images/background.png
-- examples/gallery-site/source/images/galleries/cristian-gallery-1/001.jpg
-- examples/gallery-site/source/images/galleries/cristian-gallery-1/002.jpg
-- examples/gallery-site/source/images/galleries/cristian-gallery-1/003.jpg
-- examples/gallery-site/source/images/galleries/cristian-gallery-1/004.jpg
-- examples/gallery-site/source/images/galleries/luca-gallery-1/001.jpg
-- examples/gallery-site/source/images/galleries/luca-gallery-1/002.JPG
-- examples/gallery-site/source/images/galleries/luca-gallery-1/003.jpg
-- examples/gallery-site/source/images/galleries/luca-gallery-1/004.JPG
-- examples/gallery-site/source/images/middleman.png
-- examples/gallery-site/source/index.html.erb
-- examples/gallery-site/source/javascripts/all.js
-- examples/gallery-site/source/layouts/layout.erb
-- examples/gallery-site/source/stylesheets/all.css
-- examples/gallery-site/source/stylesheets/normalize.css
-- examples/gallery-site/source/tutorial.md
 - lib/skypager.rb
-- lib/skypager/builder.rb
 - lib/skypager/builder/server.rb
 - lib/skypager/builder/webhook_handler.rb
-- lib/skypager/cli/commands/build.rb
-- lib/skypager/cli/commands/config.rb
-- lib/skypager/cli/commands/create.rb
-- lib/skypager/cli/commands/deploy.rb
-- lib/skypager/cli/commands/edit.rb
-- lib/skypager/cli/commands/list.rb
-- lib/skypager/cli/commands/setup.rb
-- lib/skypager/cli/commands/site.rb
-- lib/skypager/cli/commands/sync.rb
+- lib/skypager/cli.rb
+- lib/skypager/cli/01_extensions.rb
+- lib/skypager/cli/config.rb
 - lib/skypager/configuration.rb
 - lib/skypager/core_ext.rb
-- lib/skypager/data.rb
-- lib/skypager/data/excel_spreadsheet.rb
-- lib/skypager/data/google_spreadsheet.rb
-- lib/skypager/data/request.rb
-- lib/skypager/data/source.rb
-- lib/skypager/data/source_routes_proxy.rb
-- lib/skypager/dns.rb
-- lib/skypager/extension.rb
-- lib/skypager/middleman/commands/data.rb
-- lib/skypager/middleman/commands/deploy.rb
-- lib/skypager/middleman/commands/sync.rb
 - lib/skypager/proxy.rb
 - lib/skypager/router.rb
 - lib/skypager/site.rb
-- lib/skypager/sync.rb
-- lib/skypager/sync/amazon.rb
-- lib/skypager/sync/dropbox.rb
-- lib/skypager/sync/dropbox/delta.rb
-- lib/skypager/sync/folder.rb
-- lib/skypager/sync/github.rb
-- lib/skypager/sync/google.rb
 - lib/skypager/tar.rb
 - lib/skypager/version.rb
 - skypager.gemspec
-- spec/dummy/site-one/.gitignore
-- spec/dummy/site-one/Gemfile
-- spec/dummy/site-one/config.rb
-- spec/dummy/site-one/source/images/background.png
-- spec/dummy/site-one/source/images/middleman.png
-- spec/dummy/site-one/source/index.html.erb
-- spec/dummy/site-one/source/javascripts/all.js
-- spec/dummy/site-one/source/layouts/layout.erb
-- spec/dummy/site-one/source/stylesheets/all.css
-- spec/dummy/site-one/source/stylesheets/normalize.css
-- spec/lib/skypager/builder/server_spec.rb
-- spec/lib/skypager/configuration_spec.rb
-- spec/lib/skypager/data_spec.rb
-- spec/lib/skypager/site_spec.rb
-- spec/lib/skypager_spec.rb
-- spec/skypager-test-config.rb.example
-- spec/spec_helper.rb
-- spec/support/fixtures/cwd_config.json
-- spec/support/fixtures/home_config.json
-- spec/support/json_helper.rb
 homepage: http://skypager.io
 licenses:
 - MIT
@@ -427,30 +241,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Skypager lets people collaborate on advanced, dynamic sites using simple
   familiar tools
-test_files:
-- spec/dummy/site-one/.gitignore
-- spec/dummy/site-one/Gemfile
-- spec/dummy/site-one/config.rb
-- spec/dummy/site-one/source/images/background.png
-- spec/dummy/site-one/source/images/middleman.png
-- spec/dummy/site-one/source/index.html.erb
-- spec/dummy/site-one/source/javascripts/all.js
-- spec/dummy/site-one/source/layouts/layout.erb
-- spec/dummy/site-one/source/stylesheets/all.css
-- spec/dummy/site-one/source/stylesheets/normalize.css
-- spec/lib/skypager/builder/server_spec.rb
-- spec/lib/skypager/configuration_spec.rb
-- spec/lib/skypager/data_spec.rb
-- spec/lib/skypager/site_spec.rb
-- spec/lib/skypager_spec.rb
-- spec/skypager-test-config.rb.example
-- spec/spec_helper.rb
-- spec/support/fixtures/cwd_config.json
-- spec/support/fixtures/home_config.json
-- spec/support/json_helper.rb
-has_rdoc: 
+test_files: []