bitballoon 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c7866ae749fd47feefac0cf704eb56132f41653
-  data.tar.gz: 02b384fdb2d8d50c2874bcf640c67aa9f0c4656a
+  metadata.gz: c588189c9a104f90e2ad87493ceb496ca7d5aa01
+  data.tar.gz: 411c2dc541f248a0751e071746a86ae024e46284
 SHA512:
-  metadata.gz: 096836497aa39b7f9961eaf243a8a079306dd0d18a3675f4543833a7cf4e1ef15f052d268d974b811430588ccae20bd217e96706de035ce5441361daffbab3d3
-  data.tar.gz: 62423a9a5781ac034ef06bb0e67426a923927ee5f535224762bc0297bea6001612c5f6171df3872a02586b5a78f3e3670b49474ba10772b685b525772777c221
+  metadata.gz: e196e56cd6b436727c08696a9f371eb080d1fe3faa94438a8b56a9a3035f7cbf05c735ebc1a3e52262a8ada9b7fa9c743e44ebf233f001c32ca08be7d86f67d5
+  data.tar.gz: 4a81d173863aafac2c6bd2abe669b3f45344d9dd8bf502c70fccae5c0b9fc7d2dffe45f8127bce4d307d3639174f41bcc24c660b8d60351400a1402bbc4415e5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bitballoon (0.1.4)
+    bitballoon (0.2.0)
       highline
       oauth2 (>= 0.9.2)
       slop
@@ -14,15 +14,14 @@ GEM
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     highline (1.6.21)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
+    jwt (1.0.0)
     minitest (5.0.8)
-    multi_json (1.9.2)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    oauth2 (0.9.3)
+    oauth2 (0.9.4)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)

data/README.md

@@ -28,7 +28,7 @@ or put it in a Gemfile and run `bundle install`
 Authenticating
 ==============
 
-You'll need an application client id and a client secret before you can access the BitBalloon API. Please contact us at team@bitballoon.com for your credentials.
+Register a new application at https://www.bitballoon.com/applications to get your Oauth2 secret and key.
 
 Once you have your credentials you can instantiate a BitBalloon client.
 
@@ -41,7 +41,7 @@ Before you can make any requests to the API, you'll need to authenticate with OA
 If you're authenticating on behalf of a user, you'll need to get a valid access token for that user. Use the BitBalloon client to request an authentication URL:
 
 ```ruby
-url = bitballoon.authorize_url(:redirect_urai => "http://www.example.com/callback")
+url = bitballoon.authorize_url(:redirect_uri => "http://www.example.com/callback")
 ```
 
 The user then visits that URL and will be prompted to authorize your application to access his BitBalloon sites. If she grants permission, she'll be redirected back to the `redirect_uri` provided in the `authorize_url` call. This URL must match the redirect url configured for your BitBalloon application. Once the user comes back to your app, you'll be able to access a `code` query parameter that gives you an authorization code. Use this to finish the OAuth2 flow:
@@ -132,17 +132,13 @@ Creating a site from a zip file:
 site = bitballoon.sites.create(:zip => "/tmp/my-site.zip")
 ```
 
-Both methods will create the site and upload the files. The site will then be processing.
+Both methods will create the site and upload the files to a new deploy.
 
-```ruby
-site.state == "processing"
-site.processing? == true
-```
-
-Refresh a site to update the state:
+Creating a site with a dir or a zip is actually a shortcut for something like this:
 
 ```ruby
-    site.refresh
+site = bitballoon.sites.create(:name => "unique-site-subdomain", :custom_domain => "www.example.com")
+deploy = site.deploys.create(:dir => "path/to/my-site")
 ```
 
 Use `wait_for_ready` to wait until a site has finished processing.
@@ -153,20 +149,29 @@ site.wait_for_ready
 site.state == "ready"
 ```
 
+This also works on a specific deploy, and you can pass in a block to execute after each polling action:
+
+```ruby
+deploy = site.deploys.create(:dir => "/tmp/my-site")
+deploy.wait_for_ready do |deploy|
+  puts "Current state: #{deploy.state}"
+end
+```
+
 Redeploy a site from a dir:
 
 ```ruby
 site = bitballoon.sites.get(site_id)
-site.update(:dir => "/tmp/my-site")
-site.wait_for_ready
+deploy = site.deploys.create(:dir => "/tmp/my-site")
+deploy.wait_for_ready
 ```
 
 Redeploy a site from a zip file:
 
 ```ruby
 site = bitballoon.sites.get(site_id)
-site.update(:zip => "/tmp/my-site.zip")
-site.wait_for_ready
+deploy = site.deploys.create(:zip => "/tmp/my-site.zip")
+deploy.wait_for_ready
 ```
 
 Update the name of the site (its subdomain), the custom domain and the notification email for form submissions:
@@ -195,7 +200,7 @@ Access a specific deploy
 
 ```ruby
 site = bitballoon.sites.get(site_id)
-site.deploys.get(id)
+deploy = site.deploys.get(id)
 ```
 
 Restore a deploy (makes it the current live version of the site)
@@ -204,6 +209,12 @@ Restore a deploy (makes it the current live version of the site)
 site.deploys.get(id).restore
 ```
 
+Create a new deploy
+
+```ruby
+deploy = site.deploys.create(:dir => "/tmp/my-site")
+```
+
 Users
 =====
 
@@ -427,4 +438,3 @@ Revoke access token:
 ```ruby
 bitballoon.access_tokens.get("token-string").destroy
 ```
-

data/bin/bitballoon

@@ -65,4 +65,4 @@ opts = Slop.parse do
       puts "Site deployed: #{site.url}"
     end
   end
-end
+end

data/lib/bitballoon/collection_proxy.rb

@@ -45,4 +45,4 @@ module BitBalloon
       [prefix, self.class.path].compact.join("/")
     end
   end
-end
+end

data/lib/bitballoon/deploy.rb

@@ -4,10 +4,54 @@ module BitBalloon
            :admin_url, :deploy_url, :screenshot_url, :created_at, :updated_at,
            :user_id, :required
 
+    def upload_dir(dir)
+      return unless state == "uploading"
+
+      shas = Hash.new { [] }
+      glob = ::File.join(dir, "**", "*")
+
+      Dir.glob(glob) do |file|
+        next unless ::File.file?(file)
+        pathname = ::File.join("/", file[dir.length..-1])
+        next if pathname.match(/(^\/?__MACOSX\/|\/\.)/)
+        sha = Digest::SHA1.hexdigest(::File.read(file))
+        shas[sha] = shas[sha] + [pathname]
+      end
+
+      (required || []).each do |sha|
+        shas[sha].each do |pathname|
+          client.request(:put, ::File.join(path, "files", URI.encode(pathname)), :body => ::File.read(::File.join(dir, pathname)), :headers => {"Content-Type" => "application/octet-stream"})
+        end
+      end
+
+      refresh
+    end
+
+    def wait_for_ready(timeout = 900)
+      start = Time.now
+      while !(ready?)
+        sleep 5
+        refresh
+        puts "Got state: #{state}"
+        raise "Error processing site: #{error_message}" if error?
+        yield(self) if block_given?
+        raise "Timeout while waiting for ready" if Time.now - start > timeout
+      end
+      self
+    end
+
+    def ready?
+      state == "ready"
+    end
+
+    def error?
+      state == "error"
+    end
+
     def restore
       response = client.request(:post, ::File.join(path, "restore"))
       process(response.parsed)
       self
     end
   end
-end
+end

data/lib/bitballoon/deploys.rb

@@ -3,5 +3,36 @@ require "bitballoon/deploy"
 module BitBalloon
   class Deploys < CollectionProxy
     path "/deploys"
+
+    def create(attributes)
+      if attributes[:dir]
+        response = client.request(:post, path,
+          :body => JSON.generate({:files => inventory(attributes[:dir])}),
+          :headers => {"Content-Type" => "application/json"}
+        )
+        Deploy.new(client, response.parsed).tap do |deploy|
+          deploy.upload_dir(attributes[:dir])
+        end
+      elsif attributes[:zip]
+        response = client.request(:post, path,
+          :body => ::File.read(attributes[:zip]),
+          :headers => {"Content-Type" => "application/zip"}
+        )
+        Deploy.new(client, response.parsed)
+      else
+        raise "Need dir or zip to create a deploy"
+      end
+    end
+
+    private
+    def inventory(dir)
+      files = {}
+      Dir[::File.join(dir, "**", "*")].each do |file|
+        next unless ::File.file?(file)
+        path = ::File.join("/", file[dir.length..-1])
+        files[path] = Digest::SHA1.hexdigest(::File.read(file))
+      end
+      files
+    end
   end
-end
+end

data/lib/bitballoon/site.rb

@@ -4,32 +4,8 @@ require 'uri'
 module BitBalloon
   class Site < Model
     fields :id, :state, :premium, :claimed, :name, :custom_domain, :url,
-           :admin_url, :deploy_url, :screenshot_url, :created_at, :updated_at,
-           :password, :notification_email, :user_id, :required, :error_message
-
-    def upload_dir(dir)
-      return unless state == "uploading"
-
-      shas = Hash.new { [] }
-      glob = ::File.join(dir, "**", "*")
-
-      Dir.glob(glob) do |file|
-        next unless ::File.file?(file)
-        pathname = ::File.join("/", file[dir.length..-1])
-        next if pathname.match(/(^\/?__MACOSX\/|\/\.)/)
-        sha = Digest::SHA1.hexdigest(::File.read(file))
-        shas[sha] = shas[sha] + [pathname]
-      end
-
-
-      (required || []).each do |sha|
-        shas[sha].each do |pathname|
-          client.request(:put, ::File.join(path, "files", URI.encode(pathname)), :body => ::File.read(::File.join(dir, pathname)), :headers => {"Content-Type" => "application/octet-stream"})
-        end
-      end
-
-      refresh
-    end
+           :admin_url, :deploy_id, :deploy_url, :screenshot_url, :created_at, :updated_at,
+           :password, :notification_email, :user_id, :error_message, :required
 
     def ready?
       state == "current"
@@ -39,25 +15,19 @@ module BitBalloon
       state == "error"
     end
 
-    def wait_for_ready(timeout = 900)
-      start = Time.now
-      while !(ready?)
-        sleep 5
-        refresh
-        raise "Error processing site: #{error_message}" if error?
-        yield(self) if block_given?
-        raise "Timeout while waiting for ready" if Time.now - start > timeout
-      end
+    def wait_for_ready(timeout = 900, &block)
+      deploy = deploys.get(deploy_id)
+      raise "Error fetching deploy #{deploy_id}" unless deploy
+      deploy.wait_for_ready(timeout, &block)
       self
     end
 
     def update(attributes)
+      response = client.request(:put, path, :body => mutable_attributes(attributes))
+      process(response.parsed)
       if attributes[:zip] || attributes[:dir]
-        site = collection.new(client).create(attributes.merge(:id => id))
-        process(site.attributes)
-      else
-        response = client.request(:put, path, :body => mutable_attributes(attributes))
-        process(response.parsed)
+        deploy = deploys.create(attributes)
+        self.deploy_id = deploy.id
       end
       self
     end

data/lib/bitballoon/sites.rb

@@ -6,35 +6,13 @@ module BitBalloon
     path "/sites"
 
     def create(attributes = {})
-      site_id = attributes.delete(:id)
-      path    = site_id ? "/sites/#{site_id}" : "/sites"
-      method  = site_id ? :put : :post
-      if attributes[:dir]
-        dir = attributes.delete(:dir)
-        response = client.request(method, path, :body => JSON.generate(attributes.merge(:files => inventory(dir))), :headers => {"Content-Type" => "application/json"})
-        Site.new(client, response.parsed).tap do |site|
-          site.upload_dir(dir)
+      response = client.request(:post, path, :body => Site.new(client, {}).send(:mutable_attributes, attributes))
+      Site.new(client, response.parsed).tap do |site|
+        if attributes[:zip] || attributes[:dir]
+          deploy = site.deploys.create(attributes)
+          site.deploy_id = deploy.id
         end
-      elsif attributes[:zip]
-        zip = attributes.delete(:zip)
-        ::File.open(zip) do |file|
-          response = client.request(method, path, :body => attributes.merge(
-            :zip => Faraday::UploadIO.new(file, 'application/zip')
-          ))
-          Site.new(client, response.parsed)
-        end
-      end
-    end
-
-    private
-    def inventory(dir)
-      files = {}
-      Dir[::File.join(dir, "**", "*")].each do |file|
-        next unless ::File.file?(file)
-        path = ::File.join("/", file[dir.length..-1])
-        files[path] = Digest::SHA1.hexdigest(::File.read(file))
       end
-      files
     end
   end
-end
+end

data/lib/bitballoon/version.rb

@@ -1,3 +1,3 @@
 module BitBalloon
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

data/test/sites_test.rb

@@ -17,23 +17,29 @@ class SitesTest < MiniTest::Unit::TestCase
     index_sha = Digest::SHA1.hexdigest(::File.read(::File.join(dir, "index.html")))
 
     stub_request(:post, "https://www.bitballoon.com/api/v1/sites")
+      .to_return {|request|
+        {
+          :headers => {'Content-Type' => 'application/json'},
+          :body => JSON.generate({:id => "1234"})
+        }
+      }
+    stub_request(:post, "https://www.bitballoon.com/api/v1/sites/1234/deploys")
       .to_return {|request|
         body = JSON.parse(request.body)
         {
           :headers => {'Content-Type' => 'application/json'},
-         :body => JSON.generate({:id => "1234", :state => "uploading", :required => [index_sha]})
+          :body => JSON.generate({:id => "2345", :state => "uploading", :required => [index_sha]})
         }
       }
-    stub_request(:put, "https://www.bitballoon.com/api/v1/sites/1234/files/index.html")
-    stub_request(:get, "https://www.bitballoon.com/api/v1/sites/1234")
-      .to_return(:headers => {'Content-Type' => 'application/json'}, :body => {:id => "1234", :state => "processing"})
+    stub_request(:put, "https://www.bitballoon.com/api/v1/deploys/2345/files/index.html")
+    stub_request(:get, "https://www.bitballoon.com/api/v1/deploys/2345")
+      .to_return(:headers => {'Content-Type' => 'application/json'}, :body => {:id => "2345", :state => "processing"})
 
     site = client.sites.create(:dir => dir)
 
-    assert_equal 'processing', site.state
     assert_equal index_sha, body['files']['/index.html']
 
-    assert_requested :put, "https://www.bitballoon.com/api/v1/sites/1234/files/index.html",
+    assert_requested :put, "https://www.bitballoon.com/api/v1/deploys/2345/files/index.html",
       :body => ::File.read(::File.join(dir, "index.html")), :times => 1    # ===> Success
   end
 
@@ -41,12 +47,20 @@ class SitesTest < MiniTest::Unit::TestCase
     stub_request(:post, "https://www.bitballoon.com/api/v1/sites")
       .to_return({
         :headers => {'Content-Type' => 'application/json'},
-        :body => JSON.generate({:id => "1234", :state => "processing", :required => []})
+        :body => JSON.generate({:id => "1234"})
       })
 
+    stub_request(:post, "https://www.bitballoon.com/api/v1/sites/1234/deploys")
+    .to_return {|request|
+      {
+        :headers => {'Content-Type' => 'application/json'},
+        :body => JSON.generate({:id => "2345", :state => "uploading", :required => []})
+      }
+    }
     zip = ::File.expand_path("../files/site-dir.zip", __FILE__)
     site = client.sites.create(:zip => zip)
 
-    assert_equal 'processing', site.state
+    assert_requested :post, "https://www.bitballoon.com/api/v1/sites/1234/deploys",
+      :body => ::File.read(zip), :times => 1
   end
-end
+end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: bitballoon
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Mathias Biilmann Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: slop
   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: highline
   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: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: API Client for BitBalloon
@@ -136,17 +136,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: API Client for BitBalloon