conan 0.1.1 → 0.2.0

data/lib/conan/template/config/deploy.rb

@@ -1,10 +1,10 @@
 # Configuration
 
 # Assume that we are deploying from the "origin" remote.
-set :repository, `git remote -v | grep 'origin.*fetch' | awk '{print $2}'`.chomp
+set :repository, `git remote -v | grep -m1 origin | awk '{print $2}'`.chomp
 
 # Hopefully, your application name matches the repository name.
-set :application, File.basename(repository, ".git")
+set :application, "{{APPLICATION}}"
 
 # Files and directories to persist between deployments:
 set :shared_paths, %w[
@@ -42,4 +42,9 @@ set :user,          "rails"
 set :deploy_to,     "/mnt/#{application}"
 
 # Let Conan take over
+require "conan/version"
+unless Conan::VERSION == "{{VERSION}}"
+  $stderr.puts "Warning: Conan version mismatch."
+end
+
 require "conan/capistrano"

data/lib/conan/template/deploy/chef/dna/base.json

@@ -1,8 +1,8 @@
 {
   "rails_app": {
     "user": "rails",
-    "name": "TODO",
-    "home": "/mnt/TODO",
+    "name": "{{APPLICATION}}",
+    "home": "/mnt/{{APPLICATION}}",
     "packages": [
       "git-core",
       "libxml2-dev",

data/lib/conan/version.rb

@@ -0,0 +1,3 @@
+module Conan
+  VERSION = "0.2.0"
+end

data/lib/conan/version.rbc

@@ -0,0 +1,130 @@
+!RBIX
+7927234798965029024
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+28
+99
+7
+0
+65
+49
+1
+2
+13
+99
+12
+7
+2
+12
+7
+3
+12
+65
+12
+49
+4
+4
+15
+49
+2
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+5
+x
+5
+Conan
+x
+11
+open_module
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+5
+Conan
+i
+12
+5
+66
+65
+7
+0
+7
+1
+64
+49
+2
+2
+11
+I
+3
+I
+0
+I
+0
+I
+0
+n
+p
+3
+x
+7
+VERSION
+s
+5
+0.2.0
+x
+9
+const_set
+p
+3
+I
+2
+I
+2
+I
+c
+x
+46
+/home/paul/Projects/conan/lib/conan/version.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+0
+I
+1
+I
+1c
+x
+46
+/home/paul/Projects/conan/lib/conan/version.rb
+p
+0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: conan
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Paul Battley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 +00:00
+date: 2011-08-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,11 +43,13 @@ extra_rdoc_files: []
 
 files: 
 - bin/conan
+- lib/conan/settings.rb
 - lib/conan/capistrano.rb
 - lib/conan/smart_hash_merge.rb
 - lib/conan/deployment/git.rb
 - lib/conan/deployment/chef.rb
 - lib/conan/deployment/deploy.rb
+- lib/conan/settings.rbc
 - lib/conan/deployment.rb
 - lib/conan/template/config/servers.json
 - lib/conan/template/config/deploy.rb
@@ -63,10 +65,12 @@ files:
 - lib/conan/template/deploy/chef/recipes/Rakefile
 - lib/conan/template/deploy/chef/recipes/certificates/README
 - lib/conan/template/deploy/chef/recipes/site-cookbooks/README
-- lib/conan/template/deploy/chef/bootstrap.sh
 - lib/conan/template/CONAN_TODO
 - lib/conan/template/Capfile
+- lib/conan/version.rb
+- lib/conan/version.rbc
 - lib/conan/initializer.rb
+- lib/conan/initializer.rbc
 - README.md
 has_rdoc: true
 homepage: http://github.com/madebymany/conan

data/lib/conan/template/deploy/chef/bootstrap.sh

@@ -1,52 +0,0 @@
-#!/bin/bash
-# Bootstrap chef on Ubuntu 10.04
-
-function inform {
-  status=$1
-  echo
-  echo -e "\e[33m• ${1}\e[0m"
-  echo
-}
-
-function happy_ending {
-  echo
-  echo -e "\e[32m✓ ${1}\e[0m"
-  exit 0
-}
-
-function croak {
-  echo
-  echo -e "\e[31m✗ $status failed. Aborting.\e[0m"
-  exit 1
-}
-
-command -v chef-solo >/dev/null && \
-happy_ending "Chef is already bootstrapped. Nothing more to do."
-
-inform "Updating package index"
-apt-get update || croak
-
-inform "Setting up build environment"
-apt-get install -y build-essential || croak
-
-inform "Installing Ruby Enterprise Edition"
-case `uname -m` in
-  x86_64)
-    REE="http://rubyforge.org/frs/download.php/71098/ruby-enterprise_1.8.7-2010.02_amd64_ubuntu10.04.deb"
-    ;;
-  *)
-    REE="http://rubyforge.org/frs/download.php/71100/ruby-enterprise_1.8.7-2010.02_i386_ubuntu10.04.deb"
-    ;;
-esac
-echo "Fetching ${REE}"
-curl -s -L -o ree.deb "${REE}" || croak
-dpkg -i ree.deb || croak
-rm ree.deb
-
-inform "Installing Chef"
-gem install -v 0.5.8  ohai --no-rdoc --no-ri || croak
-gem install -v 0.9.12 chef --no-rdoc --no-ri || croak
-
-mkdir -p /etc/chef
-
-happy_ending "Chef has been bootstrapped!"