skynet-deploy 1.1.0 → 1.2.0

data/lib/skynet/app.rb

@@ -6,27 +6,46 @@ module Skynet
 
   class App < Sinatra::Base
 
+    before do
+      @payload = JSON.parse params[:payload] unless params[:payload].nil?
+    end
+
     get '/' do
       %[Hello. Check <a href="https://github.com/coshx/skynet">github</a> for more infomation on skynet]
     end
 
+    post '/' do
+      Skynet.logger.debug "post root params: #{params.inspect}"
+      app_name = settings.config.each { |n, c| break n if c[:url] == @payload['repository']['url'] }
+      if app_name.is_a? String
+        deploy app_name
+      else
+        Skynet.logger.warn "Could not find application to deploy"
+        "42"
+      end
+    end
+
     post '/:app_name' do |app_name|
-      Skynet.logger.debug "params: #{params.inspect}"
-      @payload = JSON.parse params[:payload]
-      @config  = settings.config[app_name]
-      if deployable?
-        Builder.build app_name, @config, branch
+      Skynet.logger.debug "post /#{app_name} params: #{params.inspect}"
+      deploy app_name
+    end
+
+    private
+
+    def deploy(app_name)
+      Skynet.logger.info %{Attempting to deploy "#{app_name.class.name}"}
+      config = settings.config[app_name]
+      if deployable? config
+        Builder.build app_name, config, branch
       else
         Skynet.logger.warn "#{app_name} is not deployable"
       end
       "42"
     end
 
-    private
-
-    def deployable?
-      @config.present? &&
-        @config[:url] == @payload['repository']['url'] &&
+    def deployable?(config)
+      config.present? &&
+        config[:url] == @payload['repository']['url'] &&
         @payload['after'] !~ /^0{40}$/
     end
 

data/lib/skynet/builder/base.rb

@@ -27,6 +27,8 @@ module Skynet
         @key     = config[:key]
 
         if config[:branches].blank?
+          Skynet.logger.warn "Passing a single branch and destination is deprecated and will be removed in 2.0"
+          Skynet.logger.warn "Please change to:\nbranches:\n  #{config[:branch]}: #{config[:destination]}"
           self.branches = { config[:branch] => config[:destination] }
         else
           self.branches = config[:branches]

data/lib/skynet/cli.rb

@@ -97,6 +97,20 @@ module Skynet
       run_wizard options[:file]
     end
 
+    desc 'hook PROJECT_NAME', 'Generates an example post_receive hook for PROJECT_NAME'
+    method_option :file, type: :string, default: './config.yml', aliases: '-f', desc: 'Configuration file'
+    method_option :output, type: :string, default: './post-receive', aliases: '-o', desc: 'Output file'
+    method_option :server, type: :string, default: 'http://localhost:7575', aliases: '-s', desc: 'Location of running skynet server'
+    def hook(project)
+      if File.exists? options[:output]
+        Skynet.logger.fatal %{Output file "#{options[:output]}" already exists}
+        exit 1
+      end
+      config = load_configuration(options[:file])[project]
+      server = "#{options[:server].chomp '/'}/#{project}"
+      HookGenerator.new(config, server, options[:output]).generate
+    end
+
     private
 
     def run_wizard(file = './config.yml')
@@ -104,6 +118,10 @@ module Skynet
     end
 
     def load_configuration(file)
+      unless File.exists? file
+        Skynet.logger.fatal %{Configuration file "#{file}" does not exist}
+        exit 1
+      end
       YAML.load_file(file).with_indifferent_access
     end
   end

data/lib/skynet/hook_generator.rb

@@ -0,0 +1,29 @@
+require 'json'
+require 'active_support/core_ext/string/strip'
+
+class HookGenerator
+
+  attr_reader :config, :server, :output
+
+  def initialize(config, server, output)
+    @config = config
+    @server = server
+    @output = output
+  end
+
+  def generate
+    File.open(output, 'w') do |file|
+      payload = {
+          repository: { url: config[:url] },
+          before: '$oldrev',
+          after: '$newrev',
+          ref: '$refname'
+      }
+      file.write <<-EOS.strip_heredoc
+        read oldrev newrev refname
+
+        curl -d "payload=#{payload.to_json.gsub('"', '\"')}" #{server}
+      EOS
+    end
+  end
+end

data/lib/skynet/templates/config.yml

@@ -1,26 +1,18 @@
 # Base configuration for Skynet
 #
-# Example for single branch deployment:
-# project_name:
-#   url: https://github.com/owner/project_name
-#   type: jekyll
-#   branch: master
-#   destination: /var/www/project_name
-#
-# Example for multiple branch deployment:
+# Example for public repository 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
-
+#   branches:
+#     master: /var/www/project_name
+#     develop: /var/www/project_name_staging
 

data/lib/skynet/version.rb

@@ -1,3 +1,3 @@
 module Skynet
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/skynet.rb

@@ -7,6 +7,7 @@ module Skynet
   autoload :App,     'skynet/app'
   autoload :CLI,     'skynet/cli'
   autoload :Wizard,  'skynet/wizard'
+  autoload :HookGenerator, 'skynet/hook_generator'
 
   def self.logger
     @logger ||= Logger.new(STDOUT)

data/skynet.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'thor',          '~> 0.16'
   s.add_runtime_dependency 'activesupport', '~> 3.2'
   s.add_runtime_dependency 'activemodel',   '~> 3.2'
+  s.add_runtime_dependency 'multi_json',    '~> 1.0'
 
   s.add_development_dependency 'rake',             '~> 0.9'
   s.add_development_dependency 'rspec',            '~> 2.11'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skynet-deploy
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +210,7 @@ files:
 - lib/skynet/builder/jekyll.rb
 - lib/skynet/builder/static.rb
 - lib/skynet/cli.rb
+- lib/skynet/hook_generator.rb
 - lib/skynet/templates/config.yml
 - lib/skynet/version.rb
 - lib/skynet/wizard.rb
@@ -217,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4491089130922770134
+      hash: -3009597360161477294
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: