kensa 1.2.0rc4 → 1.2.0rc5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kensa (1.2.0rc4)
+    kensa (1.2.0rc5)
       artifice (~> 0.6.0)
       launchy (~> 2.0.5)
       mechanize (~> 1.0.0)

data/bin/kensa

@@ -24,6 +24,7 @@ ARGV.options do |o|
   o.on("-h", "--help") { command = "help" }
   o.on("-p plan", "--plan") { |plan| options[:plan] = plan }
   o.on("-v", "--version") { options[:command] = "version" }
+  o.on("-t template", "--template")  { |t| options[:template] = t }
   o.parse!
 end
 
@@ -33,6 +34,8 @@ begin
   args = ARGV.dup
   ARGV.clear
   Client.new(args, options).run!
+rescue Client::CommandFailed => e
+  puts "We're sorry, but #{e.message} "
 rescue Client::CommandInvalid
   abort File.read(__FILE__).split('__END__').last
 end
@@ -63,10 +66,17 @@ OPTIONS
   --post
     Use HTTP POST for single sign-on instead of GET
 
+  -t, --template name    
+    Desired template to clone for create command from:
+    git://github.com/heroku/kensa-template-<name>
+    try sinatra, clojure, or node 
+
 COMMANDS
 
   init            Creates a skeleton manifest
 
+  create <name>   Creates a skeleton application from --template
+
   test <type>     Simulate call from Heroku (provision or deprovision)
 
   run <command>   Provisions a resource and runs command in returned ENV
@@ -93,4 +103,3 @@ TEST TYPES
 
   manifest
     Confirm that the manifest is valid.  Automatically runs before all tests.
-

data/lib/heroku/kensa/client.rb

@@ -3,9 +3,51 @@ require 'term/ansicolor'
 require 'launchy'
 
 module Heroku
+  class Git
+    class << self
+      def verify_create(app_name, template)
+        raise CommandInvalid.new("template #{clone_url(template)} does not exist") unless template_exists?(template)
+        raise CommandInvalid.new("Need git to clone repository") unless git_installed?
+      end
+
+      def template_exists?(template)
+        true
+      end
+
+      def git_installed?
+        `git` rescue false
+      end
+
+      def clone(app_name, template)
+        verify_create(app_name, template)
+        cmd = "git clone #{clone_url(template)} #{app_name}" 
+        puts cmd
+        `#{cmd}`
+        raise Exception.new("couldn't clone the repository from #{clone_url(template)}") unless File.directory?("#{app_name}")
+        puts "Created #{app_name} from #{template} template"
+      end
+
+      def clone_url(name)
+        prefix = ENV['REPO_PREFIX'] || "heroku"
+        if name.include? "://"  #its a full url
+          return name
+        elsif name.include? "/" #its a non-heroku repo
+          name = "#{prefix}/#{name}" 
+        else                    #its one of ours 
+          name = "#{prefix}/kensa-create-#{name}" 
+        end
+
+        "git://github.com/#{name}"
+      end
+    end
+  end
+
   module Kensa
+<<<<<<< HEAD
     class UserError < RuntimeError; end
 
+=======
+>>>>>>> kensa_create
     class Client
       def initialize(args, options)
         @args    = args
@@ -16,7 +58,10 @@ module Heroku
         @options[:filename]
       end
 
+      #you fucked up
       class CommandInvalid < Exception; end
+      #we fucked up
+      class CommandFailed  < Exception; end
 
       def run!
         command = @args.shift || @options[:command]
@@ -29,6 +74,23 @@ module Heroku
         Screen.new.message "Initialized new addon manifest in #{filename}\n"
       end
 
+      def create
+        app_name = @args.shift
+        template = @options[:template]
+        raise CommandInvalid.new("Need git to supply a template") unless template
+        raise CommandInvalid.new("Need git to supply an application name") unless app_name
+
+        begin
+          Git.clone(app_name, template)
+        rescue Exception => e
+          raise CommandFailed.new("error cloning #{Git.clone_url(template)} into #{app_name}") 
+        end
+
+        Dir.chdir("./#{app_name}")
+        `./after_clone #{app_name}` if File.exist?('./after_clone')
+      end
+
+
       def test
         case check = @args.shift
           when "manifest"

data/lib/heroku/kensa/version.rb

@@ -1,6 +1,6 @@
 module Heroku
   module Kensa
-    VERSION = "1.2.0rc4"
+    VERSION = "1.2.0rc5"
   end
 end
 

data/test.rb

@@ -0,0 +1 @@
+puts ARGV

data/test/create_test.rb

@@ -0,0 +1,12 @@
+$:.unshift(File.expand_path("../..",__FILE__))
+require 'test/lib/dependencies'
+
+class CreateTest < Test::Unit::TestCase
+  def kensa(cmd)
+    `./bin/kensa #{cmd}`
+  end
+
+  def test_create_with_manifest
+    kensa "create"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kensa
 version: !ruby/object:Gem::Version
-  version: 1.2.0rc4
+  version: 1.2.0rc5
   prerelease: 5
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70143233487380 !ruby/object:Gem::Requirement
+  requirement: &70286834541360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70143233487380
+  version_requirements: *70286834541360
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70143233486780 !ruby/object:Gem::Requirement
+  requirement: &70286834540620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -36,10 +36,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *70143233486780
+  version_requirements: *70286834540620
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70143233486160 !ruby/object:Gem::Requirement
+  requirement: &70286834539660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -47,10 +47,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70143233486160
+  version_requirements: *70286834539660
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70143233485520 !ruby/object:Gem::Requirement
+  requirement: &70286834538920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -58,10 +58,10 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *70143233485520
+  version_requirements: *70286834538920
 - !ruby/object:Gem::Dependency
   name: artifice
-  requirement: &70143233484660 !ruby/object:Gem::Requirement
+  requirement: &70286834538100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,10 +69,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70143233484660
+  version_requirements: *70286834538100
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70143233484140 !ruby/object:Gem::Requirement
+  requirement: &70286834537140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -80,10 +80,10 @@ dependencies:
         version: 3.1.3
   type: :development
   prerelease: false
-  version_requirements: *70143233484140
+  version_requirements: *70286834537140
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70143233483660 !ruby/object:Gem::Requirement
+  requirement: &70286834536360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -91,10 +91,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70143233483660
+  version_requirements: *70286834536360
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70143233482980 !ruby/object:Gem::Requirement
+  requirement: &70286834534940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -102,10 +102,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70143233482980
+  version_requirements: *70286834534940
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70143233482240 !ruby/object:Gem::Requirement
+  requirement: &70286834534060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -113,10 +113,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *70143233482240
+  version_requirements: *70286834534060
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70143233481460 !ruby/object:Gem::Requirement
+  requirement: &70286834532820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -124,10 +124,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70143233481460
+  version_requirements: *70286834532820
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70143233476760 !ruby/object:Gem::Requirement
+  requirement: &70286834531800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -135,10 +135,10 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70143233476760
+  version_requirements: *70286834531800
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &70143233476160 !ruby/object:Gem::Requirement
+  requirement: &70286834530740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -146,10 +146,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70143233476160
+  version_requirements: *70286834530740
 - !ruby/object:Gem::Dependency
   name: artifice
-  requirement: &70143233475540 !ruby/object:Gem::Requirement
+  requirement: &70286834529480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -157,7 +157,7 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70143233475540
+  version_requirements: *70286834529480
 description: Kensa is a command-line tool to help add-on providers integrating their
   services with Heroku. It manages manifest files, and provides a TDD-like approach
   for programmers to test and develop their APIs.
@@ -182,6 +182,8 @@ files:
 - lib/heroku/kensa/sso.rb
 - lib/heroku/kensa/version.rb
 - set-env.sh
+- test.rb
+- test/create_test.rb
 - test/deprovision_test.rb
 - test/helper.rb
 - test/lib/dependencies.rb
@@ -208,6 +210,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2094105926373190861
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -221,6 +226,7 @@ signing_key:
 specification_version: 3
 summary: Tool to help Heroku add-on providers integrating their services
 test_files:
+- test/create_test.rb
 - test/deprovision_test.rb
 - test/helper.rb
 - test/lib/dependencies.rb