capricorn 2.0.7 → 2.0.8

data/README.md

@@ -1 +1,9 @@
-# Capricorn
+capricorn(7) -- semi automatic deployment of rails applications
+===============================================================
+
+## INSTALL
+
+Install with Rubygems:
+
+    $ [sudo] gem install capricorn
+    $ capricornd

data/bin/capricornctl

@@ -3,6 +3,7 @@
 begin
   require 'capricorn-client'
 rescue LoadError
+  require 'rubygems'
   $:.unshift(File.dirname(__FILE__)+'/../lib')
   require 'capricorn-client'
 end

data/bin/capricornutl

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+begin
+  require 'capricorn-util'
+rescue LoadError
+  $:.unshift(File.dirname(__FILE__)+'/../lib')
+  require 'capricorn-util'
+end
+
+Capricorn::Util.start

data/erlang/lib/capricorn/src/cap_cluster_gems.erl

@@ -161,8 +161,9 @@ code_change(_OldVsn, State, _Extra) ->
 
 -spec start_spec_reader(state()) -> state() .
 start_spec_reader(State) ->
-  RubyCmd    = os:find_executable("capricorn-gem-spec"),
-  SpecReader = bertio:open_port({spawn_executable, RubyCmd}, [exit_status]),
+  RubyCmd    = os:find_executable("capricornutl"),
+  SpecReader = bertio:open_port({spawn_executable, RubyCmd}, [
+    exit_status, {args, ["internal:inspector"]}]),
   State#state{spec_reader=SpecReader}.
 
 

data/erlang/lib/capricorn/src/cap_machine_apps.erl

@@ -230,8 +230,9 @@ code_change(_OldVsn, State, _Extra) ->
 
 
 start_scaffolder(State) ->
-  Cmd  = os:find_executable("capricorn-app-scaffolder"),
-  Port = bertio:open_port({spawn_executable, Cmd}, [exit_status]),
+  Cmd  = os:find_executable("capricornutl"),
+  Port = bertio:open_port({spawn_executable, Cmd}, [
+    exit_status, {args, ["internal:scaffolder"]}]),
   State#ctx{scaffolder=Port}.
 
 

data/lib/capricorn-client.rb

@@ -1,4 +1,6 @@
 module Capricorn
+  gem 'fd-bertrpc'
+
   require 'thor'
   require 'yaml'
   require 'bertrpc'
@@ -14,6 +16,21 @@ module Capricorn
     require 'capricorn-client/cli/applications/gems'
     require 'capricorn-client/cli/gems'
     require 'capricorn-client/cli/machines'
+    require 'capricorn-client/cli/builder'
+    require 'capricorn-client/cli/deployer'
+    require 'capricorn-client/cli/releaser'
+
+    def self.start(given_args = ARGV, config = {})
+      if self == Capricorn::CLI
+        case given_args[0]
+        when 'deploy'
+          given_args[0] = 'deploy:version'
+        when 'build'
+          given_args[0] = 'build:current'
+        end
+      end
+      super(given_args, config)
+    end
 
     def self.banner(task)
       "#{banner_base} #{task.formatted_usage(self, true)}"
@@ -29,10 +46,14 @@ module Capricorn
     end
 
     def method_missing(meth, *args)
-      meth = meth.to_s
-      klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
-      args.unshift(task) if task
-      klass.start(args, :shell => self.shell)
+      if self.class == Capricorn::CLI
+        meth = meth.to_s
+        klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
+        args.unshift(task) if task
+        klass.start(args, :shell => self.shell)
+      else
+        super
+      end
     end
 
     class_option :cluster,     :type => :string, :aliases => ['-c']
@@ -40,18 +61,6 @@ module Capricorn
     class_option :application, :type => :string, :aliases => ['-a', '--app']
     class_option :environment, :type => :string, :aliases => ['-e', '--env']
 
-    desc "deploy", "deploy an new gem"
-    def deploy
-      last = Dir.glob("pkg/*.gem").sort do |a, b|
-        File.stat(a).mtime <=> File.stat(b).mtime
-      end.last
-
-      $capr_gems_weak_push = true
-
-      invoke "gems:push", [last]
-      invoke "apps:fupdate"
-    end
-
   end
 
 end

data/lib/capricorn-client/cli/applications/domains.rb

@@ -6,10 +6,10 @@ class Capricorn::CLI::ApplicationsDomains < Capricorn::CLI
 
   desc "list", "list all domains"
   def list
-    application_info[4].sort! do |a, b|
+    (application_info[4] || []).sort! do |a, b|
       a <=> b
     end
-    application_info[4].each do |domain|
+    (application_info[4] || []).each do |domain|
       puts "- #{domain}"
     end
   end
@@ -27,6 +27,8 @@ class Capricorn::CLI::ApplicationsDomains < Capricorn::CLI
     machine, id = *application
     app         = application_info
 
+    app[4] ||= []
+
     if app[4].include?(domain)
       halt "Domain is already configured"
     end
@@ -49,6 +51,8 @@ class Capricorn::CLI::ApplicationsDomains < Capricorn::CLI
     machine, id = *application
     app         = application_info
 
+    app[4] ||= []
+
     unless app[4].include?(domain)
       halt "Domain is not configured"
     end

data/lib/capricorn-client/cli/applications/gems.rb

@@ -6,22 +6,22 @@ class Capricorn::CLI::ApplicationsGems < Capricorn::CLI
 
   desc "list", "list all gems"
   def list
-    application_info[9].sort! do |a,b|
+    (application_info[9] || []).sort! do |a,b|
       a[1] <=> b[1]
     end
 
-    application_info[10].sort! do |a,b|
+    (application_info[10] || []).sort! do |a,b|
       a <=> b
     end
 
     puts "Configured gems:"
-    application_info[10].each do |name|
+    (application_info[10] || []).each do |name|
       puts "- #{name}"
     end
     puts
 
     puts "Used gems:"
-    application_info[9].each do |gem|
+    (application_info[9] || []).each do |gem|
       puts "- #{gem[1]} (#{gem[2].flatten.join('.')})"
     end
   end
@@ -33,6 +33,8 @@ class Capricorn::CLI::ApplicationsGems < Capricorn::CLI
     machine, id = *application
     app         = application_info
 
+    app[10] ||= []
+
     if app[10].include?(gem_name)
       halt "Gem is already configured"
     end
@@ -49,6 +51,8 @@ class Capricorn::CLI::ApplicationsGems < Capricorn::CLI
     machine, id = *application
     app         = application_info
 
+    app[10] ||= []
+
     unless app[10].include?(gem_name)
       halt "Gem is not configured"
     end

data/lib/capricorn-client/cli/builder.rb

@@ -0,0 +1,48 @@
+class Capricorn::CLI::Builder < Capricorn::CLI
+  include Capricorn::Helpers
+
+  namespace :build
+
+  desc "current", "build the current version"
+  def current
+    system("rake build")
+  end
+
+  desc "patch", "build a new patch"
+  def patch
+    check_clean_stage
+    bump_version(:patch)
+  end
+
+  desc "minor", "build a new minor"
+  def minor
+    check_clean_stage
+    bump_version(:minor)
+  end
+
+  desc "major", "build a new major"
+  def major
+    check_clean_stage
+    bump_version(:major)
+  end
+
+private
+
+  def check_clean_stage
+    unless %x[ git status 2>&1 ].include?('nothing to commit (working directory clean)')
+      halt("Your git stage is not clean!")
+    end
+  end
+
+  def bump_version(level)
+    system("rake version:bump:#{level} build")
+
+    if %x[ rake version ] =~ /^Current\sversion[:]\s([\d.]+)$/im
+      $last_version = $1
+      system("git tag -a -m \"#{$last_version}\" #{$last_version}")
+      system("git push origin master")
+      system("git push origin master --tags")
+    end
+  end
+
+end

data/lib/capricorn-client/cli/deployer.rb

@@ -0,0 +1,27 @@
+class Capricorn::CLI::Deployer < Capricorn::CLI
+  include Capricorn::Helpers
+
+  namespace :deploy
+
+  desc "version [VERSION]", "build the current version"
+  def version(version=nil)
+    gem = nil
+    if version
+      gem = Dir.glob("pkg/*-#{version}.gem").last
+    else
+      gem = Dir.glob("pkg/*.gem").sort do |a, b|
+        File.stat(a).mtime <=> File.stat(b).mtime
+      end.last
+    end
+
+    unless gem
+      halt "Please build a gem first!"
+    end
+
+    $capr_gems_weak_push = true
+
+    invoke "gems:push", [gem]
+    invoke "apps:fupdate"
+  end
+
+end

data/lib/capricorn-client/cli/releaser.rb

@@ -0,0 +1,30 @@
+class Capricorn::CLI::Releaser < Capricorn::CLI
+  include Capricorn::Helpers
+
+  namespace :release
+
+  desc "patch", "release a new patch"
+  def patch
+    release_version(:patch)
+  end
+
+  desc "minor", "release a new minor"
+  def minor
+    release_version(:minor)
+  end
+
+  desc "major", "release a new major"
+  def major
+    release_version(:major)
+  end
+
+private
+
+  def release_version(level)
+    invoke "build:#{level}"
+    if $last_version
+      invoke "deploy:version", [$last_version]
+    end
+  end
+
+end

data/lib/capricorn-util.rb

@@ -0,0 +1,35 @@
+module Capricorn
+  require 'thor'
+  require 'yaml'
+
+  class Util  < Thor
+    namespace "default"
+
+    require 'capricorn-util/internal'
+
+    def self.banner(task)
+      "#{banner_base} #{task.formatted_usage(self, true)}"
+    end
+
+    def help(meth=nil)
+      if meth && !self.respond_to?(meth)
+        klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
+        klass.start(["-h", task].compact, :shell => self.shell)
+      else
+        super
+      end
+    end
+
+    def method_missing(meth, *args)
+      if self.class == Capricorn::Util
+        meth = meth.to_s
+        klass, task = Thor::Util.find_class_and_task_by_namespace(meth)
+        args.unshift(task) if task
+        klass.start(args, :shell => self.shell)
+      else
+        super
+      end
+    end
+
+  end
+end

data/lib/capricorn-util/internal.rb

@@ -0,0 +1,68 @@
+class Capricorn::Util::Internal < Capricorn::Util
+  namespace :internal
+
+  require 'capricorn'
+  require 'rubygems/format'
+
+  desc "scaffolder", "scaffolder process for capricorn"
+  def scaffolder
+    Erlang do |cmd|
+      case cmd.shift
+      when :create
+        recipe = cmd.shift
+        app = convert_app(cmd.first)
+
+        recipe_path = File.expand_path("../../lib/capricorn/recipes/#{recipe}.rb", __FILE__)
+        ctx = Capricorn::SystemContext.run(recipe_path, :application => app)
+
+        send t[true, t[ctx.www_user, ctx.www_group, ctx.root_path]]
+      end
+    end
+  end
+
+  desc "inspector", "inspector process for capricorn"
+  def inspector
+    Erlang do |path|
+
+      unless File.extname(path) == ".gem" and File.file?(path)
+        error :not_found
+      end
+
+      begin
+        format = Gem::Format.from_file_by_path(path)
+      rescue Exception => e
+        error :gem_error, e.message
+      end
+
+      spec = format.spec
+      unless spec
+        error :gem_error, "Invalid gem"
+      end
+
+      dependencies = spec.runtime_dependencies.collect do |dep|
+        version_requirements = dep.version_requirements.as_list.collect do |req|
+          op, version = *req.split(/\s+/, 2)
+          BERT::Tuple[op, version]
+        end
+        BERT::Tuple[dep.name, version_requirements]
+      end
+
+      send BERT::Tuple[spec.name, spec.version.to_s, dependencies]
+
+    end
+  end
+
+private
+
+  def convert_app(app)
+    application = {}
+    application[:id]          = app[1]
+    application[:node]        = app[2]
+    application[:name]        = app[3]
+    application[:domain]      = app[4].shift
+    application[:aliases]     = app[4]
+    application[:environment] = app[5]
+    application
+  end
+
+end

data/lib/capricorn/version.rb

@@ -1,5 +1,5 @@
 module Capricorn
 
-  VERSION = '2.0.7'
+  VERSION = '2.0.8'
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capricorn
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: false
   segments: 
   - 2
   - 0
-  - 7
-  version: 2.0.7
+  - 8
+  version: 2.0.8
 platform: ruby
 authors: 
 - Simon Menke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +02:00
+date: 2010-06-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,8 +120,7 @@ email:
 executables: 
 - capricornctl
 - capricornd
-- capricorn-app-scaffolder
-- capricorn-gem-spec
+- capricornutl
 extensions: 
 - ext/extconf.rb
 extra_rdoc_files: []
@@ -137,10 +136,15 @@ files:
 - lib/capricorn-client/cli/applications/domains.rb
 - lib/capricorn-client/cli/applications/gems.rb
 - lib/capricorn-client/cli/applications.rb
+- lib/capricorn-client/cli/builder.rb
+- lib/capricorn-client/cli/deployer.rb
 - lib/capricorn-client/cli/gems.rb
 - lib/capricorn-client/cli/machines.rb
+- lib/capricorn-client/cli/releaser.rb
 - lib/capricorn-client/helpers.rb
 - lib/capricorn-client.rb
+- lib/capricorn-util/internal.rb
+- lib/capricorn-util.rb
 - lib/capricorn.rb
 - erlang/lib/bert/doc/overview.edoc
 - erlang/lib/bert/ebin/bert.app
@@ -207,8 +211,7 @@ files:
 - README.md
 - bin/capricornctl
 - bin/capricornd
-- bin/capricorn-app-scaffolder
-- bin/capricorn-gem-spec
+- bin/capricornutl
 has_rdoc: true
 homepage: http://github.com/fd/capricorn
 licenses: []

data/bin/capricorn-app-scaffolder

@@ -1,27 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'capricorn'
-
-def convert_app(app)
-  application = {}
-  application[:id]          = app[1]
-  application[:node]        = app[2]
-  application[:name]        = app[3]
-  application[:domain]      = app[4].shift
-  application[:aliases]     = app[4]
-  application[:environment] = app[5]
-  application
-end
-
-Erlang do |cmd|
-  case cmd.shift
-  when :create
-    recipe = cmd.shift
-    app = convert_app(cmd.first)
-
-    recipe_path = File.expand_path("../../lib/capricorn/recipes/#{recipe}.rb", __FILE__)
-    ctx = Capricorn::SystemContext.run(recipe_path, :application => app)
-
-    send t[true, t[ctx.www_user, ctx.www_group, ctx.root_path]]
-  end
-end

data/bin/capricorn-gem-spec

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'capricorn'
-require 'rubygems/format'
-
-Erlang do |path|
-
-  unless File.extname(path) == ".gem" and File.file?(path)
-    error :not_found
-  end
-
-  begin
-    format = Gem::Format.from_file_by_path(path)
-  rescue Exception => e
-    error :gem_error, e.message
-  end
-
-  spec = format.spec
-  unless spec
-    error :gem_error, "Invalid gem"
-  end
-
-  dependencies = spec.runtime_dependencies.collect do |dep|
-    version_requirements = dep.version_requirements.as_list.collect do |req|
-      op, version = *req.split(/\s+/, 2)
-      BERT::Tuple[op, version]
-    end
-    BERT::Tuple[dep.name, version_requirements]
-  end
-
-  send BERT::Tuple[spec.name, spec.version.to_s, dependencies]
-
-end