capo 0.0.3 → 0.9.0

data/README.md

@@ -1,6 +1,8 @@
 # Capo
 
-Command line utility to fetch and manage recipes
+![Capo.io](http://capo.io/assets/logo.png)
+
+Command line utility to fetch and manage recipes with [Capo.io](http://capo.io).
 
 ## Installation
 
@@ -18,7 +20,21 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Run `capo begin` to set up capistrano in your project. It will create a `Capfile` and `config/deploy.rb` in the folder where you run the command.
+
+Run `capo list` to get a list of aailable recipes. Install recipes with `capo install a_recipe`.
+
+You can get a list of installed recipes with `capo added`.
+
+## About
+
+The [Capo.io](http://capo.io) website and this gem were build in 48 hours for the [2012 Rails Rumble](http://railsrumble.com/).
+
+Both were built by
+* [Jeroen Jacobs](https://github.com/jeroenj)
+* [Joren De Groof](https://github.com/joren)
+* [Steven De Coeyer](https://github.com/zhann)
+* [Hannes Fostie](https://github.com/hannesfostie)
 
 ## Contributing
 

data/bin/capo

@@ -33,12 +33,16 @@ case ARGV[0]
 when 'init'
   Capo::Init.fetch_repository
 when 'begin'
+  Capo::Init.fetch_repository
   Capo::Capfile.generate
 when 'list'
+  Capo::Init.fetch_repository
   Capo::Recipes.list
 when 'add'
+  Capo::Init.fetch_repository
   Capo::Recipes.add ARGV[1]
 when 'added'
+  Capo::Init.fetch_repository
   Capo::Recipes.added
 else
   puts option_parser unless @usage_shown

data/lib/capo/init.rb

@@ -1,4 +1,5 @@
 require 'git'
+require 'timeout'
 
 module Capo
   module Init
@@ -8,15 +9,26 @@ module Capo
 
         puts "Pulling changes from remote repository"
         begin
-          repo = Git.open Capo.repository_path
-          puts repo.lib.send :command, 'pull' # repo.pull is broken in git-1.2.5, see: https://github.com/schacon/ruby-git/issues/32
+          repo = with_timeout{Git.open Capo.repository_path}
+          puts with_timeout{repo.lib.send :command, 'pull'} # repo.pull is broken in git-1.2.5, see: https://github.com/schacon/ruby-git/issues/32
         rescue
           puts "Repository doesn't seem to exist yet..."
           puts "Cloning repository from #{repository_url} to #{Capo.repository_path}"
-          Git.clone repository_url, Capo.repository_path
+          with_timeout{Git.clone repository_url, Capo.repository_path}
           retry
         end
       end
+
+      private
+      def with_timeout
+        begin
+          Timeout::timeout 2 do
+            yield
+          end
+        rescue Timeout::Error
+          puts 'Git timeout. Skipping repository update.'
+        end
+      end
     end
   end
 end

data/lib/capo/recipes.rb

@@ -10,20 +10,29 @@ module Capo
       end
 
       def add name
-        raise "Recipe '#{name}' not found" unless recipes.map{|recipe| recipe[:name]}.include? name
+        recipe = recipes.select{|r| r[:name] == name}.first
+        raise "Recipe '#{name}' not found" unless recipe
+
+        if (dependencies = recipe[:dependencies]).any?
+          puts "[#{name}] Installing dependencies first:"
+          dependencies.each do |dependency|
+            puts "[#{dependency}] Installing depdendency"
+            add dependency
+          end
+        end
 
         app_recipe_path = File.join app_deploy_path, "#{name}.rb"
 
         Dir.mkdir(app_deploy_path) unless Dir.exists?(app_deploy_path)
 
-        puts "Copying recipe '#{name}' to #{app_recipe_path}"
+        puts "[#{name}] Copying recipe to #{app_recipe_path}"
         FileUtils.copy File.join(Capo.repository_path, 'recipes', name, "#{name}.rb"), app_recipe_path
 
-        puts "Adding line to Capfile"
+        puts "[#{name}] Adding line to Capfile"
         capfile = File.join Capo.app_path, 'Capfile'
         File.open(capfile, 'a+'){|f| f.puts "load 'config/deploy/#{name}'"}
 
-        puts "Recipe #{name} added"
+        puts "[#{name}] Recipe added"
       end
 
       def added

data/lib/capo/version.rb

@@ -1,3 +1,3 @@
 module Capo
-  VERSION = '0.0.3'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors: