siteleaf 0.9.22 → 0.9.23

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6f81b5e2b0e30522c443b49419ddc93eaee2ce31
+  data.tar.gz: 5eb92f3d3bf0e6f555f7620f762462caac9fde80
+SHA512:
+  metadata.gz: ab5c786334310e8ff5def9532ee81c0dea9b2d29dbeacc5b8352820c6b16cea3770c777cd036ef02ee4c9c70420cf02a0fc3917262e12c24e31737bfdd15cf60
+  data.tar.gz: 27ac15f55218d9d7227ab0cfdf4fe8ce6c06ef43925c8a99bef7c071fb8bdbbe7ff60dd822ed593197181a9b1bbebd7be6bd15c07d7f859d71ac7b0454514aed

data/README.md

@@ -63,9 +63,19 @@ To upload your theme to Siteleaf, run the following command:
 
     siteleaf push theme
     
-To switch Siteleaf users or re-authenticate:
+**Publish your site:**
+
+To publish your site changes to your hosting provider, run the following command:
+
+    siteleaf publish
+    
+**Switch Siteleaf users or re-authenticate:**
 
     siteleaf auth
+    
+**For a full list of commands, run:**
+
+    siteleaf help
 
 
 Using this gem in your application
@@ -89,7 +99,7 @@ Siteleaf.api_key    = 'KEY'
 Siteleaf.api_secret = 'SECRET'
 
 # get authenticated user
-me = Siteleaf::Users.find('me')
+me = Siteleaf::User.find('me')
 
 # get all sites
 sites = Siteleaf::Site.all
@@ -107,6 +117,9 @@ site = Siteleaf::Site.find('5196f137cc8591956b000001')
 site.title = 'New Title'
 site.save
 
+# publish site
+site.publish
+
 # delete site
 site.delete
 
@@ -118,7 +131,7 @@ pages = site.pages
 
 # create new page in site
 page = Siteleaf::Page.create({
-  :site_id  => site.id
+  :site_id  => site.id,
   :title    => 'My Page',
   :body     => 'This is my first page.'
 })
@@ -128,7 +141,7 @@ page = Siteleaf::Page.find('519719ddcc85910626000001')
 
 # create new post in page
 post = Siteleaf::Post.create({
-  :parent_id => page.id
+  :parent_id => page.id,
   :title     => 'My Post',
   :body      => 'This is my first post.'
 })

data/bin/siteleaf

@@ -11,11 +11,12 @@ Usage: siteleaf [COMMAND] [OPTIONS]
 
 Commands:
   auth                Login in with your credentials
-  s, server           Starts a local server.
+  s, server           Starts a local server
   c, config DOMAIN    Configure an existing directory
   n, new DOMAIN       Creates new site on siteleaf.net
   pull theme          Pulls theme files for configured site from Siteleaf
-  push theme          Pushes all files in dir as theme to configured site.
+  push theme          Pushes all files in dir as theme to configured site
+  publish             Publish website to hosting provider
   help                Prints this help document
   version             Prints the siteleaf gem version
 
@@ -23,6 +24,7 @@ Options:
   -h, --help          Prints this help document
   -v, --version       Prints the siteleaf gem version
   -p, --port PORT     Binds local server to PORT (default: 9292)
+  -q, --quiet         Suppress publish status
 
 See https://github.com/siteleaf/siteleaf-gem for additional documentation.
 )
@@ -151,6 +153,24 @@ def put_theme_assets(site_id)
   end
 end
 
+def publish(site_id, quiet = true)
+  site = Siteleaf::Site.new(id: site_id)
+  job = site.publish
+  
+  if quiet
+    puts "=> Publish queued.\n"
+  else
+    last_msg = nil
+    job.stream do |s|
+      if (msg = s["message"]) && (msg != last_msg)
+        puts msg
+        last_msg = msg
+      end
+    end
+    puts "=> Publish completed.\n"
+  end
+end
+
 case ARGV[0]
 when '-v', '--version', 'version'
   puts Siteleaf::VERSION
@@ -210,6 +230,15 @@ when 'push'
   else
     puts "`#{ARGV[0]}` command not found.\n"
   end
+when 'publish'
+  if auth != false
+    quiet = %w[-q --quiet].include?(ARGV[1]) && ARGV[1]
+    if site_id = get_site_id
+      publish(site_id, quiet)
+    else
+      puts "Site not configured, run `siteleaf config yoursite.com`.\n"
+    end
+  end
 else
   puts "`#{ARGV[0]}` command not found.\n"
   puts help

data/lib/siteleaf.rb

@@ -5,6 +5,7 @@ require 'siteleaf/version'
 require 'siteleaf/client'
 require 'siteleaf/entity'
 require 'siteleaf/asset'
+require 'siteleaf/job'
 require 'siteleaf/page'
 require 'siteleaf/post'
 require 'siteleaf/server'

data/lib/siteleaf/job.rb

@@ -0,0 +1,20 @@
+module Siteleaf
+  class Job < Entity
+  
+    attr_reader :id
+    
+    def stream(&callback)
+      HTTParty.send(:get, Siteleaf.api_url("jobs/#{self.id}"), {
+        :basic_auth => {:username => Siteleaf.api_key, :password => Siteleaf.api_secret},
+        :stream_body => true
+      }) do |fragment|
+        if str = fragment.match(/{.*}/)
+          if json = JSON.parse(str[0])
+            callback.call(json)
+          end
+        end
+      end
+    end
+    
+  end
+end

data/lib/siteleaf/page.rb

@@ -23,8 +23,8 @@ module Siteleaf
     end
     
     def pages
-      result = Client.get "pages/#{self.id}/pages"
-      result.map { |r| self.new(r) } if result
+      result = Client.get "pages/#{self.id}?include=pages"
+      result["pages"].map { |r| Page.new(r) } if result
     end
     
     def page

data/lib/siteleaf/site.rb

@@ -1,7 +1,7 @@
 module Siteleaf
   class Site < Entity
 
-    attr_accessor :title, :domain, :timezone
+    attr_accessor :title, :domain, :timezone, :meta
     attr_reader :id, :user_id, :created_at, :updated_at
     
     def self.find_by_domain(domain)
@@ -35,5 +35,10 @@ module Siteleaf
       Client.post "sites/#{self.id}/preview", {"url" => url, "template" => template}
     end
     
+    def publish
+      result = Client.post "sites/#{self.id}/publish", {}
+      Job.new(id: result.parsed_response["job_id"]) if result
+    end
+    
   end
 end

data/lib/siteleaf/version.rb

@@ -1,3 +1,3 @@
 module Siteleaf
-  VERSION = "0.9.22"
+  VERSION = "0.9.23"
 end

data/siteleaf.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |gem|
   gem.summary       = "Siteleaf Ruby interface"
   gem.homepage      = "http://siteleaf.com"
   
-  gem.required_ruby_version = '>= 1.8'
+  gem.required_ruby_version = '>= 1.9.3'
   
-  gem.add_dependency 'httparty', '<= 0.11'
-  gem.add_dependency 'httmultiparty', '<= 0.3.12'
+  gem.add_dependency 'httparty', '>= 0.13.3'
+  gem.add_dependency 'httmultiparty', '>= 0.3.13'
   gem.add_dependency 'rack'
 
   gem.files         = `git ls-files`.split($/)

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: siteleaf
 version: !ruby/object:Gem::Version
-  version: 0.9.22
-  prerelease: 
+  version: 0.9.23
 platform: ruby
 authors:
 - Siteleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <=
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.13.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <=
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: httmultiparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <=
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.12
+        version: 0.3.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <=
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.12
+        version: 0.3.13
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Ruby interface and command line utility for the Siteleaf API.
@@ -77,6 +70,7 @@ files:
 - lib/siteleaf/asset.rb
 - lib/siteleaf/client.rb
 - lib/siteleaf/entity.rb
+- lib/siteleaf/job.rb
 - lib/siteleaf/page.rb
 - lib/siteleaf/post.rb
 - lib/siteleaf/server.rb
@@ -88,26 +82,25 @@ files:
 homepage: http://siteleaf.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '1.8'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Siteleaf Ruby interface
 test_files: []