netlify 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 500cb94ed39ac0ca44ca44deb7a447dfd566b15a
-  data.tar.gz: 48194a2bc54a43d712c9cceb2b26b3835ed590a3
+  metadata.gz: 437996fb50a44a765375a8b7f176fc5b4e2e8b14
+  data.tar.gz: 902fce5832eba704da8714fc7d24a5d77e0d4d71
 SHA512:
-  metadata.gz: 8614bd0635a023f9f63bcb7663c7f6930b3d8867b948324ec3784c986f90799740ebbbd849d1285aaa73fc61fbf3a294e36be3199649c8ecd691e85a569db1e3
-  data.tar.gz: 42f05bd119c82170e2c6e121cedeb6b28c85527ef0d88ea5e11bc1b8e2296f03fde5c09cd393ab30e797595dc16172b6a80853ccfc9bfb717f2ab78106de047a
+  metadata.gz: fc9e999d347c6c0e23a5381f5a35235a6da6c5509befa1fc52fbc14b4c4f32b439da8215c7e9ff9df57049a71441be93b67a512575dca27380d462c8f3872df5
+  data.tar.gz: 96c84262f78082f8d127131ad2ebb9effbcd8a66eda35fbf2aae37784198a8055e9290ee5480a9d54fcdf45df789c411bf565a350555d331154afb7fb8274740

data/README.md

@@ -197,50 +197,33 @@ deploy = site.deploys.create(:dir => "/tmp/my-site", :draft => true)
 
 This will upload and process a deploy. You can view the deploy at `deploy.deploy_url` and make it the live version of the site with `deploy.publish`.
 
+Continuous Deployment
+=====================
 
-Users
-=====
-
-Access all users you have access to
-
-```ruby
-Netlify.users.all
-```
-
-Access a specific user
+You can also configure continuous deployment for a new or existing site from the Ruby client.
 
-```ruby
-Netlify.users.get(id)
-```
+You'll need a Github access token (this will never get sent to Netlify) in addition to your Netlify token. Make sure this access token have the permission to add a deploy key and a web hook to your repository.
 
-Create a user. **Reseller only**. A unique email is required. You can optionally include a unique uid, typically the database ID you use for the user on your end.
+Create a new site with continuous deployment:
 
 ```ruby
-Netlify.users.create(:email => "some@email.com", :uid => "12345")
+client.sites.create(:github => {
+    :repo => "netlify/example",
+    :dir => "build",
+    :cmd => "middleman build",
+    :access_token => GITHUB_ACCESS_TOKEN
+})
 ```
 
-Update a user. **Reseller only**.
+Configure continuous deployment for an existing site:
 
 ```ruby
-Netlify.users.get(id).update(:email => "new@email.com", :uid => "12345")
-```
-
-Delete a user. **Reseller only**
-
-```ruby
-Netlify.users.get(id).destroy
-```
-
-Get all sites for a user
-
-```ruby
-Netlify.users.get(id).sites
-```
-
-Get all form submissions for a user
-
-```ruby
-Netlify.users.get(id).submissions
+site.configure_github!(
+  :repo => "netlify/example",
+  :dir => "build",
+  :cmd => "middleman build",
+  :access_token => GITHUB_ACCESS_TOKEN
+)
 ```
 
 Forms
@@ -361,63 +344,3 @@ Remove a snippet
 site.snippet.get(id).destroy
 end
 ```
-
-DNS Zones
-=========
-
-Resellers can manage DNS Zones through the ruby client. To use this feature your access token must belong to a reseller administrator.
-
-Create a DNS Zone
-
-```ruby
-Netlify.dns_zones.create(:name => "www.example.com", :user_id => "1234")
-```
-
-Get all DNS Zones
-
-```ruby
-Netlify.dns_zones.all
-```
-
-Delete a DNS Zone
-
-```ruby
-dns_zone.destroy
-```
-
-Get all dns records for a zone
-
-```ruby
-dns_zone.dns_records.all
-```
-
-Adding a new record (supported types: A, CNAME, TXT, MX)
-
-```ruby
-dns_zone.dns_records.create(:hostname => "www", :type => "CNAME", :value => "Netlify.com", :ttl => "500")
-```
-
-Deleting a record
-
-```ruby
-dns_record.destroy
-```
-
-Access Tokens
-=============
-
-Resellers can create and revoke access tokens on behalf of their users. To use this feature your access token must belong to a reseller administrator.
-
-Create access token:
-
-```ruby
-Netlify.access_tokens.create(:user => {:email => "test@example.com", :uid => 123})
-```
-
-The user must have either an email or a uid or both. Both email and uid must be unique within your reseller account. The uid would typically correspond to your internal database id for the user. If the users doesn't exist, a new user will be created on the fly.
-
-Revoke access token:
-
-```ruby
-Netlify.access_tokens.get("token-string").destroy
-```

data/lib/netlify.rb

@@ -10,6 +10,7 @@ require "netlify/files"
 require "netlify/snippets"
 require "netlify/users"
 require "netlify/deploys"
+require "netlify/deploy_keys"
 require "netlify/dns_zones"
 require "netlify/access_tokens"
 require "netlify/multipass"

data/lib/netlify/client.rb

@@ -52,6 +52,10 @@ module Netlify
       Submissions.new(self)
     end
 
+    def deploy_keys
+      DeployKeys.new(self)
+    end
+
     def users
       Users.new(self)
     end

data/lib/netlify/deploy.rb

@@ -32,7 +32,6 @@ module Netlify
       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

data/lib/netlify/deploy_key.rb

@@ -0,0 +1,7 @@
+require "Netlify/dns_records"
+
+module Netlify
+  class DeployKey < Model
+    fields :id, :public_key, :created_at
+  end
+end

data/lib/netlify/deploy_keys.rb

@@ -0,0 +1,7 @@
+require "Netlify/deploy_key"
+
+module Netlify
+  class DeployKeys < CollectionProxy
+    path "/deploy_keys"
+  end
+end

data/lib/netlify/model.rb

@@ -62,4 +62,4 @@ module Netlify
       ::File.join(*[prefix, collection.path, id.to_s].compact)
     end
   end
-end
+end

data/lib/netlify/site.rb

@@ -4,8 +4,8 @@ require 'uri'
 module Netlify
   class Site < Model
     fields :id, :state, :premium, :claimed, :name, :custom_domain, :url,
-           :admin_url, :deploy_id, :deploy_url, :screenshot_url, :created_at, :updated_at,
-           :password, :notification_email, :user_id, :error_message, :required
+           :admin_url, :deploy_id, :build_id, :deploy_url, :screenshot_url, :created_at, :updated_at,
+           :password, :notification_email, :user_id, :error_message, :required, :deploy_hook
 
     def ready?
       state == "current"
@@ -32,6 +32,37 @@ module Netlify
       self
     end
 
+    def configure_github!(options)
+      raise Client::NetlifyError, "You must specify a Github access_token" unless options[:access_token]
+      raise Client::NetlifyError, "You must specify a Github repo" unless options[:repo]
+      require "github_api"
+
+      _, user, repo = *options[:repo].match(/^([^\/]+)\/([^\/]+)$/)
+      unless user && repo
+        raise Client::NetlifyError, "Invalid github repo #{options[:repo]}"
+      end
+
+      github = Github.new(:oauth_token => options[:access_token])
+      deploy_key = client.deploy_keys.create({})
+      github.repos.keys.create(user, repo, title: "Netlify", key: deploy_key.public_key)
+      response = client.request(:put, path, :body => {
+        :github => {
+          :repo => options[:repo],
+          :deploy_key_id => deploy_key.id,
+          :dir => options[:dir],
+          :cmd => options[:cmd],
+          :branch => options[:branch],
+          :env => options[:env]
+        }
+      })
+      process(response.parsed)
+      github.repos.hooks.create(user, repo, name: "web", active: true, events: ["push"], config: {
+        url: deploy_hook,
+        content_type: 'json'
+      })
+      self
+    end
+
     def destroy!
       client.request(:delete, path)
       true

data/lib/netlify/sites.rb

@@ -11,6 +11,8 @@ module Netlify
         if attributes[:zip] || attributes[:dir]
           deploy = site.deploys.create(attributes)
           site.deploy_id = deploy.id
+        elsif attributes[:github]
+          site.configure_github!(attributes[:github])
         end
       end
     end

data/lib/netlify/version.rb

@@ -1,3 +1,3 @@
 module Netlify
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/netlify.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'Netlify/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "netlify"
+  gem.version       = Netlify::VERSION
+  gem.authors       = ["Mathias Biilmann Christensen"]
+  gem.email         = ["mathias@Netlify.com"]
+  gem.description   = %q{API Client for Netlify}
+  gem.summary       = %q{API Client for Netlify}
+  gem.homepage      = "https://www.netlify.com"
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+
+  gem.add_dependency "oauth2", ">=  0.9.2"
+  gem.add_dependency "slop"
+  gem.add_dependency "highline"
+  gem.add_dependency "github_api"
+  gem.add_development_dependency "minitest"
+  gem.add_development_dependency "webmock"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netlify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mathias Biilmann Christensen
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_api
+  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
@@ -98,6 +112,8 @@ files:
 - lib/netlify/client.rb
 - lib/netlify/collection_proxy.rb
 - lib/netlify/deploy.rb
+- lib/netlify/deploy_key.rb
+- lib/netlify/deploy_keys.rb
 - lib/netlify/deploys.rb
 - lib/netlify/dns_record.rb
 - lib/netlify/dns_records.rb
@@ -118,6 +134,7 @@ files:
 - lib/netlify/user.rb
 - lib/netlify/users.rb
 - lib/netlify/version.rb
+- netlify.gemspec
 - test/client_test.rb
 - test/files/site-dir.zip
 - test/files/site-dir/index.html