skynet-deploy 0.9.2 → 1.0.0

data/README.md

@@ -8,13 +8,50 @@ Skynet builds and deploys web sites on your VPS or bare metal server. It is trig
 Current Builder Types
 ---------------------
 
-1. Static. Just copies entire repository to proper location
+1. Static. Copies the entire repository to the specified destination and then
+   removes the destination .git folder
 1. Jekyll. Run jekyll on your repository. Entirely controlled by
    site's `_config.yml`
 
 Usage
 -----
+
 * Install Skynet: `$ gem install skynet-deploy`
 * Install basic config file: `$ skynet config <first project name>`
 * edit config file to add your repositories
+* Run builder by hand to ensure everything works: `$ skynet build`
+* Add `http://YOUR_SKYNET_SERVER/PROJECT_NAME` as a WebHook URL to your repository under `Admin -> Service Hooks`
 * Start server: `$ skynet server`
+
+Config file arguments
+---------------------
+
+### Required configuration variables for each project: ###
+* `url` Value passed from post-receive hook to verify that the deploy
+  should happen
+* `type` The builder type to invoke for this application
+* Either `branch` and `destination` together or only `branches` must be specified
+
+### Optional configuration variables: ###
+* `key` SSH private key file to be used to clone and pull from private
+  repositories. Should be given as an absolute path
+* `repository` The location to clone the repository from. This is
+  usually inferred from `url`, but can be overridden here
+* `branch` The branch to be deployed
+* `destination` Absolute path to the deployed application
+* `branches` For when multiple branches should be deployed to this
+  machine (such as a production + staging strategy). `branches` is a
+  hash with keys being the branch name and values being the destination
+
+Example Post-Receive Hook
+-------------------------
+
+Add this to your `.git/hooks/post-receive` file to use Skynet with
+a git server other than GitHub.
+
+    read oldrev newrev refname
+
+    curl -d "payload={\"repository\":{\"url\":\"<<same path as in config.yml>>\"},\"before\":\"$oldrev\",\"after\":\"$newrev\",\"ref\":\"$refname\"}" http://YOUR_SKYNET_SERVER/PROJECT_NAME
+
+The URL must be visible from the Skynet server, as it will pull a new
+copy of the repository from this server.

data/lib/skynet/app.rb

@@ -1,5 +1,6 @@
 require 'sinatra/base'
 require 'json'
+require 'active_support/core_ext/object/blank'
 
 module Skynet
 
@@ -11,10 +12,10 @@ module Skynet
 
     post '/:app_name' do |app_name|
       Skynet.logger.debug "params: #{params.inspect}"
-      payload = JSON.parse params[:payload]
-      config  = settings.config[app_name]
-      if deployable? config, payload
-        Builder.build app_name, config
+      @payload = JSON.parse params[:payload]
+      @config  = settings.config[app_name]
+      if deployable?
+        Builder.build app_name, @config, branch
       else
         Skynet.logger.warn "#{app_name} is not deployable"
       end
@@ -23,12 +24,16 @@ module Skynet
 
     private
 
-    def deployable?(config, payload)
-      !config.nil? &&
-        config[:url] == payload['repository']['url'] &&
-        payload['ref'] == "refs/heads/#{config[:branch]}" &&
+    def deployable?
+      @config.present? &&
+        @config[:url] == @payload['repository']['url'] &&
         payload['after'] !~ /^0{40}$/
     end
+
+    def branch
+      @payload['ref'] =~ %r[^refs/heads/(.*)$]
+      $1
+    end
   end
 
 end

data/lib/skynet/builder.rb

@@ -5,8 +5,8 @@ module Skynet
     autoload :Static, 'skynet/builder/static'
     autoload :Jekyll, 'skynet/builder/jekyll'
 
-    def self.build(app, config)
-      for_app(app, config).build
+    def self.build(app, config, branch=nil)
+      for_app(app, config).build branch
     end
 
     def self.for_app(app, config, type=nil)

data/lib/skynet/builder/base.rb

@@ -1,4 +1,6 @@
 require 'active_model'
+require 'active_support/core_ext/object/blank'
+require 'uri'
 
 module Skynet
   module Builder
@@ -8,32 +10,55 @@ module Skynet
     class Base
       include ActiveModel::Validations
 
-      attr_accessor :app, :url, :branch, :destination, :type
-      attr_reader :source
+      attr_accessor :app, :url, :branch, :destination, :branches, :type, :repository
+      attr_reader :source, :key
 
-      validates_presence_of :app, :url, :branch, :destination
+      validates_presence_of :app, :url, :branch, :destination, :branches
       validates_inclusion_of :type,
         in: ALLOWED_BUILDERS,
         message: "must be one of #{ALLOWED_BUILDERS}"
+      validate :branches_have_destinations
+      validate :key_is_readable, if: :key?
 
       def initialize(app, config)
-        self.app         = app
-        @config          = config
+        self.app = app
+        @config  = config
+        @source  = File.join Dir.pwd, app, '.'
+        @key     = config[:key]
+
+        if config[:branches].blank?
+          self.branches = { config[:branch] => config[:destination] }
+        else
+          self.branches = config[:branches]
+        end
+        self.branch      = branches.first[0]
+        self.destination = branches.first[1]
         self.url         = config[:url]
-        self.branch      = config[:branch]
-        self.destination = config[:destination]
         self.type        = config[:type]
-        @source          = File.join Dir.pwd, app, '.'
+        self.repository  = config[:repository]
       end
 
-      def build
-        unless valid?
-          Skynet.logger.error "Configuration error for #{app}"
-          Skynet.logger.error errors.full_messages.join '. '
-          raise ArgumentError
+      def build(branch=nil)
+        unless branch.blank?
+          return if branches[branch].blank?
+          self.branches = { branch => branches[branch] }
         end
 
-        build_repository
+        branches.each_pair do |branch, destination|
+          self.branch      = branch.to_s
+          self.destination = destination
+
+          if valid?
+            Skynet.logger.info "#{type} running for #{app} (branch: #{branch})"
+          else
+            Skynet.logger.error "Configuration error for #{app} (branch: #{branch})"
+            Skynet.logger.error errors.full_messages.join '. '
+            raise ArgumentError
+          end
+
+          build_repository
+          execute
+        end
       end
 
       private
@@ -42,20 +67,58 @@ module Skynet
         repo_exists? ? update_repo : create_repo
       end
 
+      def remote_repository
+        repository || translate_url
+      end
+
+      def translate_url
+        uri = URI.parse url
+        if uri.host == 'github.com'
+          "git@github.com:#{uri.path.gsub %r[(^/)|(/$)|(\.git$)], ''}.git"
+        else
+          url
+        end
+      rescue URI::InvalidURIError
+        url
+      end
+
       def create_repo
         Skynet.logger.debug "Creating repository for #{app}"
         Skynet.logger.debug `rm -rf #{source}`
-        Skynet.logger.info `git clone #{url} #{app}; cd #{source}; git checkout #{branch}`
+        if key?
+          Skynet.logger.info `ssh-agent bash -c 'ssh-add #{key}; git clone #{remote_repository} #{app}'; cd #{source}; git checkout #{branch}`
+        else
+          Skynet.logger.info `git clone #{remote_repository} #{app}; cd #{source}; git checkout #{branch}`
+        end
       end
 
       def update_repo
         Skynet.logger.debug "Updating repository for #{app}"
-        Skynet.logger.info `cd #{source}; git checkout #{branch}; git pull`
+        if key?
+          Skynet.logger.info `cd #{source}; git checkout #{branch}; ssh-agent bash -c 'ssh-add #{key}; git pull origin #{branch}'`
+        else
+          Skynet.logger.info `cd #{source}; git checkout #{branch}; git pull origin #{branch}`
+        end
       end
 
       def repo_exists?
         File.exist? File.join(source, '.git')
       end
+
+      def branches_have_destinations
+        return if branches.blank?
+        branches.each_pair do |b, d|
+          errors.add(:branches, "#{b} must have a destination") unless d.present?
+        end
+      end
+
+      def key?
+        key.present?
+      end
+
+      def key_is_readable
+        errors.add(:key, 'must be present and readable') unless File.readable?(key)
+      end
     end
   end
 end

data/lib/skynet/builder/jekyll.rb

@@ -4,10 +4,7 @@ module Skynet
   module Builder
     class Jekyll < Base
 
-      def build
-        Skynet.logger.info "Jekyll running for #{app}..."
-        super
-
+      def execute
         Skynet.logger.debug "PWD: #{Dir.pwd} Source: #{source} Destination: #{destination}"
         Skynet.logger.info `jekyll #{source} #{destination}`
 

data/lib/skynet/builder/static.rb

@@ -4,10 +4,7 @@ module Skynet
   module Builder
     class Static < Base
 
-      def build
-        Skynet.logger.info "Static running for #{app}..."
-        super
-
+      def execute
         Skynet.logger.debug "Removing #{destination}/*"
         FileUtils.rm_rf Dir.glob(File.join destination, '*'), secure: true
 

data/lib/skynet/cli.rb

@@ -46,12 +46,12 @@ module Skynet
       end
     end
 
-    desc "build [PROJECT_NAME]", "Builds all applications, or PROJECT_NAME only if given"
+    desc "build [PROJECT_NAME] [BRANCH_NAME]", "Builds all applications, or PROJECT_NAME only if given"
     method_option :file, type: :string, default: './config.yml', aliases: '-f', desc: 'Configuration file'
-    def build(name=nil)
+    def build(project=nil, branch=nil)
       all_apps = load_configuration options[:file]
 
-      if name.nil?
+      if project.nil?
         all_apps.each do |app, config|
           begin
             Builder.build app, config
@@ -60,11 +60,11 @@ module Skynet
           end
         end
       else
-        config = all_apps[name]
+        config = all_apps[project]
         if config.nil?
-          Skynet.logger.error "Could not find configuration for #{name}"
+          Skynet.logger.error "Could not find configuration for #{project}"
         else
-          Builder.build name, config
+          Builder.build project, config, branch
         end
       end
     end

data/lib/skynet/templates/config.yml

@@ -1,15 +1,30 @@
-# Base configuration for SkyNet
-#
-# Example project:
+# Base configuration for Skynet
 #
+# Example for single branch deployment:
 # project_name:
-#   url: git@github.com:project_name.git
-#   branch: master
+#   url: https://github.com/owner/project_name
 #   type: jekyll
+#   branch: master
 #   destination: /var/www/project_name
+#
+# Example for multiple branch deployment:
+# project_name:
+#   url: https://github.com/owner/project_name
+#   type: jekyll
+#   branches:
+#     master: /var/www/project_name_production
+#     develop: /var/www/project_name_staging
+#
+#  Example for private repository deployment:
+#  project_name:
+#    url: https://github.com/owner/project_name
+#    type: jekyll
+#    key: /home/username/.ssh/id_rsa
+#    branch: master
+#    destination: /var/www/project_name
 
 <%= @project_name %>:
-  url: https://github.com/ORGANIZATION/<%= @project_name %>
+  url: https://github.com/ORGANIZATION_OR_USER/<%= @project_name %>
   branch: master
   type: 
   destination: 

data/lib/skynet/version.rb

@@ -1,3 +1,3 @@
 module Skynet
-  VERSION = "0.9.2"
+  VERSION = "1.0.0"
 end

data/spec/skynet/builder/base_spec.rb

@@ -5,8 +5,9 @@ require 'shoulda-matchers'
 describe Skynet::Builder::Base do
 
   let(:source)  { File.join Dir.pwd, 'app', '.' }
-  let(:repo)    { 'git@github.com:app.git' }
-  let(:options) { {url: repo, branch: 'master', destination: '/var/www', type: 'static'} }
+  let(:url)     { 'https://github.com/org/app' }
+  let(:repo)    { 'git@github.com:org/app.git' }
+  let(:options) { {url: url, branch: 'master', destination: '/var/www', type: 'static'} }
   subject       { described_class.new 'app', options }
 
   describe ".validations" do
@@ -14,61 +15,143 @@ describe Skynet::Builder::Base do
     it { should validate_presence_of :url }
     it { should validate_presence_of :branch }
     it { should validate_presence_of :destination }
+    it { should validate_presence_of :branches }
     it { should ensure_inclusion_of(:type).in_array(%w[static jekyll]).allow_nil(false).allow_blank(false) }
     it { should_not allow_value('base').for :type }
+    describe "on @branches" do
+      before(:each) { subject.valid? }
+
+      context "when passed a single branch" do
+        specify { subject.errors[:branches].should be_empty }
+      end
+      context "when passed multiple valid branches" do
+        let(:options) { {url: url, type: 'static', branches: {master: '/var/www/production', develop: '/var/www/staging'}} }
+        specify { subject.errors[:branches].should be_empty }
+      end
+      context "when passed an invalid branch" do
+        let(:options) { {url: url, type: 'static', branches: {master: '/var/www', develop: ''}} }
+        it "has an error on branches" do
+          subject.errors[:branches].should include('develop must have a destination')
+        end
+      end
+    end
+    describe "on @key" do
+      context "when not passed a key" do
+        before(:each) { subject.valid? }
+        specify { subject.errors[:key].should be_empty }
+      end
+
+      context "when passed a valid key" do
+        let(:options) { {key: 'keyfile'} }
+        before(:each) do
+          File.stub(:readable?).and_return true
+          subject.valid?
+        end
+        specify { subject.errors[:key].should be_empty }
+      end
+
+      context "when passed an invalid key" do
+        let(:options) { {key: 'missing_keyfile'} }
+        before(:each) do
+          File.stub(:readable?).and_return false
+          subject.valid?
+        end
+        it "has an error on key" do
+          subject.errors[:key].should include('must be present and readable')
+        end
+      end
+    end
   end
 
   describe "#build" do
+    before(:each) do
+      subject.stub :build_repository
+      subject.stub :execute
+    end
+
     context "when valid" do
-      before(:each) { subject.stub :build_repository }
       it { expect { subject.build }.to_not raise_error }
     end
     context "when invalid" do
       let(:options) { {} }
       it { expect { subject.build }.to raise_error ArgumentError }
     end
+    context "when passing a branch" do
+      it { expect { subject.build 'master' }.to_not raise_error }
+      it "d" do
+        subject.build 'develop'
+      end
+    end
   end
 
-  describe "#build_repository" do
-    context "repo already exists" do
-      before(:each) { subject.stub(:repo_exists?).and_return true }
+  context "private methods" do
+    before(:each) do
+      subject.branch      = 'master'
+      subject.destination = '/var/www'
+    end
+
+    describe "#build_repository" do
+      context "repo already exists" do
+        before(:each) { subject.stub(:repo_exists?).and_return true }
 
-      it "updates the repository" do
-        subject.should_receive(:update_repo).with no_args
-        subject.send :build_repository
+        it "updates the repository" do
+          subject.should_receive(:update_repo).with no_args
+          subject.send :build_repository
+        end
       end
-    end
 
-    context "repo does not exist" do
-      before(:each) { subject.stub(:repo_exists?).and_return false }
+      context "repo does not exist" do
+        before(:each) { subject.stub(:repo_exists?).and_return false }
 
-      it "creates a new repository" do
-        subject.should_receive(:create_repo).with no_args
-        subject.send :build_repository
+        it "creates a new repository" do
+          subject.should_receive(:create_repo).with no_args
+          subject.send :build_repository
+        end
       end
     end
-  end
 
-  describe "#create_repo" do
-    before(:each) do
-      subject.should_receive(:`).with "rm -rf #{source}"
-      subject.should_receive(:`).with "git clone #{repo} app; cd #{source}; git checkout master"
-    end
+    describe "#create_repo" do
+      before(:each) { subject.should_receive(:`).with "rm -rf #{source}" }
 
-    it { subject.send :create_repo }
-  end
+      context "without key" do
+        it "should call git clone" do
+          subject.should_receive(:`).with "git clone #{repo} app; cd #{source}; git checkout master"
+          subject.send :create_repo
+        end
+      end
 
-  describe "#update_repo" do
-    before(:each) { subject.should_receive(:`).with "cd #{source}; git checkout master; git pull" }
+      context "with key" do
+        let(:options) { {key: 'keyfile', url: url, branch: 'master', destination: '/var/www', type: 'static'} }
+        it "should call git clone" do
+          subject.should_receive(:`).with "ssh-agent bash -c 'ssh-add keyfile; git clone #{repo} app'; cd #{source}; git checkout master"
+          subject.send :create_repo
+        end
+      end
+    end
 
-    it { subject.send :update_repo }
-  end
+    describe "#update_repo" do
+      context "without key" do
+        it "should call git pull" do
+          subject.should_receive(:`).with "cd #{source}; git checkout master; git pull origin master"
+          subject.send :update_repo
+        end
+      end
 
-  describe "#repo_exists?" do
-    before(:each) do
-      File.should_receive(:exist?).with File.join(source, '.git')
+      context "with key" do
+        let(:options) { {key: 'keyfile', url: url, branch: 'master', destination: '/var/www', type: 'static'} }
+        it "should call git pull" do
+          subject.should_receive(:`).with "cd #{source}; git checkout master; ssh-agent bash -c 'ssh-add keyfile; git pull origin master'"
+          subject.send :update_repo
+        end
+      end
     end
 
-    it { subject.send :repo_exists? }
+    describe "#repo_exists?" do
+      before(:each) do
+        File.should_receive(:exist?).with File.join(source, '.git')
+      end
+
+      it { subject.send :repo_exists? }
+    end
   end
 end

data/spec/skynet/builder/jekyll_spec.rb

@@ -6,17 +6,16 @@ describe Skynet::Builder::Jekyll do
   let(:dest)    { '/var/www/app' }
   let(:options) { {destination: dest} }
   let(:source)  { File.join Dir.pwd, app, '.' }
-  subject       { described_class.new app, options }
-
-  describe "#build" do
-    before(:each) do
-      subject.should_receive :build_repository
-      subject.stub(:valid?).and_return true
+  subject do
+    described_class.new(app, options).tap do |b|
+      b.destination = dest
     end
+  end
 
+  describe "#execute" do
     it "runs jekyll with the source and destination" do
       subject.should_receive(:`).with "jekyll #{source} #{dest}"
-      subject.build
+      subject.execute
     end
   end
 end

data/spec/skynet/builder/static_spec.rb

@@ -6,34 +6,34 @@ describe Skynet::Builder::Static do
   let(:dest)    { '/var/www/app' }
   let(:options) { {destination: dest} }
   let(:source)  { File.join Dir.pwd, app, '.' }
-  subject       { described_class.new app, options }
-
-  describe "#build" do
-    before(:each) do
-      subject.should_receive :build_repository
-      subject.stub(:valid?).and_return true
-      Dir.stub(:glob).and_return [:one, :two]
+  subject do
+    described_class.new(app, options).tap do |b|
+      b.destination = dest
     end
+  end
+
+  describe "#execute" do
+    before(:each) { Dir.stub(:glob).and_return [:one, :two] }
 
     it "removes destination files first" do
       FileUtils.stub :remove_entry_secure
       FileUtils.stub :cp_r
       FileUtils.should_receive(:rm_rf).with [:one, :two], secure: true
-      subject.build
+      subject.execute
     end
 
     it "copies files to the destination" do
       FileUtils.stub :rm_rf
       FileUtils.stub :remove_entry_secure
       FileUtils.should_receive(:cp_r).with(source, dest)
-      subject.build
+      subject.execute
     end
 
     it "removes .git from the destination" do
       FileUtils.stub :rm_rf
       FileUtils.stub :cp_r
       FileUtils.should_receive(:remove_entry_secure).with "#{dest}/.git"
-      subject.build
+      subject.execute
     end
   end
 end

data/spec/skynet/builder_spec.rb

@@ -5,9 +5,10 @@ describe Skynet::Builder do
   let(:builder)    { mock('builder').as_null_object }
   let(:mock_class) { mock('builder class').as_null_object }
   let(:config)     { {type: 'static'} }
-  let(:args)       { [:app, config] }
 
   describe ".for_app" do
+    let(:args) { [:app, config] }
+
     it "initializes a new builder class" do
       described_class.should_receive(:const_get).with('Static').and_return mock_class
       mock_class.should_receive(:new).with(:app, config).and_return builder
@@ -17,9 +18,11 @@ describe Skynet::Builder do
   end
 
   describe ".build" do
+    let(:args) { [:app, config, :master] }
+
     it "calls build on the new builder" do
       described_class.stub(:for_app).and_return builder
-      builder.should_receive(:build).with no_args
+      builder.should_receive(:build).with :master
 
       described_class.build *args
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skynet-deploy
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212012481880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+  version_requirements: *70212012481880
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212012481240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,15 +32,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.4'
+  version_requirements: *70212012481240
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212012480460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
+  version_requirements: *70212012480460
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212012479780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +54,10 @@ dependencies:
         version: '0.11'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.11'
+  version_requirements: *70212012479780
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212012479240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -85,15 +65,10 @@ dependencies:
         version: '0.16'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.16'
+  version_requirements: *70212012479240
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212012478540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,15 +76,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
+  version_requirements: *70212012478540
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212012477820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +87,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
+  version_requirements: *70212012477820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212012477360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,15 +98,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+  version_requirements: *70212012477360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212012476820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -149,15 +109,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
+  version_requirements: *70212012476820
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70212012476100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,12 +120,7 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+  version_requirements: *70212012476100
 description: Sinatra app that listens for GitHub post-receive callbacks and deploys
   your code
 email:
@@ -222,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Sinatra app that listens for GitHub post-receive callbacks and deploys your