siteleaf 0.9.15 → 0.9.16

data/bin/siteleaf

@@ -43,13 +43,13 @@ def auth(re_auth = false)
 
     puts "\nAuthorizing..."
 
-    if auth = Siteleaf::Client.auth(email, password) and auth.is_a?(Hash) and auth.has_key?('api_key')
+    if (auth = Siteleaf::Client.auth(email, password)) && (auth.is_a?(Hash)) && (auth.has_key?('api_key'))
       File.open(Siteleaf.settings_file,'w') do|file|
         Marshal.dump({:api_key => auth['api_key'], :api_secret => auth['api_secret']}, file)
       end
       puts "=> Gem authorized." if re_auth
     else
-      puts "Could not authorize, check your e-mail or password."
+      puts auth['error'] || "Could not authorize, check your e-mail or password."
     end
   end
 end
@@ -85,7 +85,7 @@ def get_theme_assets(site_id)
   if assets = Siteleaf::Theme.assets_by_site_id(site_id)
     updated_count = 0
     assets.each do |asset|
-      if File.exist?(asset.filename) && asset.checksum == Digest::MD5.hexdigest(File.read(asset.filename))
+      if File.exist?(asset.filename) && (asset.checksum == Digest::MD5.hexdigest(File.read(asset.filename)))
         # file is up to date
       else
         print "Downloading #{asset.filename}..."
@@ -173,7 +173,7 @@ when 'c', 'config', 'setup'
   end
 when 'n', 'new'
   auth
-  if site = Siteleaf::Site.create(:title => ARGV[1], :domain => ARGV[1])
+  if (site = Siteleaf::Site.create(:title => ARGV[1], :domain => ARGV[1])) && (!site.error)
     dir = ARGV.size >= 3 ? ARGV[2] : ARGV[1]
     Dir.mkdir(dir) unless File.directory?(dir)
     Dir.chdir(dir)

data/lib/siteleaf/client.rb

@@ -9,7 +9,7 @@ module Siteleaf
         })
         return request.parsed_response # parse JSON
       rescue => e
-        return e.inspect # error
+        return 'error' => e.message # error
       end
     end
 
@@ -43,7 +43,7 @@ module Siteleaf
           return request # raw
         end
       rescue => e
-        return e.inspect # error
+        return 'error' => e.message # error
       end
     end
   end

data/lib/siteleaf/entity.rb

@@ -1,5 +1,7 @@
 module Siteleaf
   class Entity
+  
+    attr_reader :error
 
     def initialize(attributes = {})
       self.attributes = attributes

data/lib/siteleaf/version.rb

@@ -1,3 +1,3 @@
 module Siteleaf
-  VERSION = "0.9.15"
+  VERSION = "0.9.16"
 end

data/siteleaf.gemspec

@@ -6,6 +6,7 @@ require 'siteleaf/version'
 Gem::Specification.new do |gem|
   gem.name          = "siteleaf"
   gem.version       = Siteleaf::VERSION
+  gem.license       = "MIT"
   gem.authors       = ["Siteleaf"]
   gem.email         = ["api@siteleaf.com"]
   gem.description   = %q{A Ruby interface and command line utility for the Siteleaf API.}
@@ -14,7 +15,7 @@ Gem::Specification.new do |gem|
   
   gem.required_ruby_version = '>= 1.8'
   
-  gem.add_dependency 'httparty'
+  gem.add_dependency 'httparty', '<= 0.11'
   gem.add_dependency 'httmultiparty'
   gem.add_dependency 'rack'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: siteleaf
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-10-16 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'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - <=
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: httmultiparty
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,8 @@ files:
 - lib/siteleaf/version.rb
 - siteleaf.gemspec
 homepage: http://siteleaf.com
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: