vigetlabs-provisional 2.0.2 → 2.0.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 2
 :minor: 0
-:patch: 2
+:patch: 3

data/lib/provisional/scm/git.rb

@@ -11,33 +11,47 @@ module Provisional
         @options = options
       end
 
+      def rescuing_exceptions(&block)
+        begin
+          yield
+        rescue
+          raise RuntimeError, "Repository not created due to exception: #{$!}"
+        end
+      end
+
       def gitignore
         Provisional::IGNORE_FILES.join("\n")
       end
 
       def init
-        FileUtils.mkdir_p @options[:name]
-        Dir.chdir @options[:name]
-        @options[:path] = Dir.getwd
-        ::Git.init
+        rescuing_exceptions do
+          FileUtils.mkdir_p @options[:name]
+          Dir.chdir @options[:name]
+          @options[:path] = Dir.getwd
+          ::Git.init
+        end
       end
 
       def generate_rails
-        generator_options = ['.', '-m', @options[:template_path]]
-        Dir.chdir @options[:path]
-        Rails::Generator::Base.use_application_sources!
-        Rails::Generator::Scripts::Generate.new.run generator_options, :generator => 'app'
+        rescuing_exceptions do
+          generator_options = ['.', '-m', @options[:template_path]]
+          Dir.chdir @options[:path]
+          Rails::Generator::Base.use_application_sources!
+          Rails::Generator::Scripts::Generate.new.run generator_options, :generator => 'app'
+        end
       end
 
       def checkin
-        repo = ::Git.open @options[:path]
-        Dir.chdir @options[:path]
-        File.open('.gitignore', 'w') do |f|
-          f.puts gitignore
+        rescuing_exceptions do
+          repo = ::Git.open @options[:path]
+          Dir.chdir @options[:path]
+          File.open('.gitignore', 'w') do |f|
+            f.puts gitignore
+          end
+          repo.add '.'
+          repo.commit 'Initial commit by Provisional'
+          repo
         end
-        repo.add '.'
-        repo.commit 'Initial commit by Provisional'
-        repo
       end
     end
   end

data/lib/provisional/scm/github.rb

@@ -5,16 +5,20 @@ module Provisional
   module SCM
     class Github < Provisional::SCM::Git
       def checkin
-        repo = super
-        github_user = repo.config 'github.user'
-        github_token = repo.config 'github.token'
-        Net::HTTP.post_form URI.parse('http://github.com/api/v2/yaml/repos/create'), {
-          'login' => github_user,
-          'token' => github_token,
-          'name' => @options[:name]
-        }
-        repo.add_remote('origin', "git@github.com:#{github_user}/#{@options[:name]}.git")
-        repo.push
+        begin
+          repo = super
+          github_user = repo.config 'github.user'
+          github_token = repo.config 'github.token'
+          Net::HTTP.post_form URI.parse('https://github.com/api/v2/yaml/repos/create'), {
+            'login' => github_user,
+            'token' => github_token,
+            'name' => @options[:name]
+          }
+          repo.add_remote('origin', "git@github.com:#{github_user}/#{@options[:name]}.git")
+          repo.push
+        rescue
+          raise RuntimeError, "Repository created locally, but not pushed to GitHub due to exception: #{$!}"
+        end
       end
     end
   end

data/lib/provisional/templates/viget.rb

@@ -20,8 +20,16 @@ plugin 'vl_cruise_control', :git => 'git://github.com/vigetlabs/vl_cruise_contro
 generate :viget_deployment
 
 # clean up
-run 'rm -rf public/index.html log/* test/fixtures config/database.yml'
-inside ('public/javascripts') do
+run 'rm -rf public/images/rails.png log/* test/fixtures config/database.yml'
+inside 'public' do
+  run 'rm -f index.html favicon.ico robots.txt'
+end
+inside 'public/javascripts' do
   run 'rm -f dragdrop.js controls.js effects.js prototype.js'
 end
+
+# install jrails javascripts
 rake 'jrails:install:javascripts'
+
+# setup shoulda rake tasks
+file 'lib/tasks/shoulda.rake', %q[require 'shoulda/tasks']

data/test/unit/git_test.rb

@@ -24,6 +24,13 @@ class GitTest < Test::Unit::TestCase
     @scm.init
   end
 
+  def test_init_should_raise_RuntimeError_if_any_step_raises_any_exception
+    FileUtils.expects(:mkdir_p).with('name').raises(Errno::EEXIST)
+    assert_raise RuntimeError do
+      @scm.init
+    end
+  end
+
   def test_generate_rails
     Dir.expects(:chdir)
     Rails::Generator::Base.expects(:use_application_sources!)
@@ -33,6 +40,13 @@ class GitTest < Test::Unit::TestCase
     @scm.generate_rails
   end
 
+  def test_generate_rails_should_raise_RuntimeError_if_any_step_raises_any_exception
+    Dir.expects(:chdir).raises(Errno::ENOENT)
+    assert_raise RuntimeError do
+      @scm.generate_rails
+    end
+  end
+
   def test_checkin
     repo_stub = stub()
     repo_stub.expects(:add).with('.')
@@ -44,4 +58,11 @@ class GitTest < Test::Unit::TestCase
     File.expects(:open).with('.gitignore', 'w').yields(gitignore_file)
     @scm.checkin
   end
+
+  def test_checkin_should_raise_RuntimeError_if_any_step_raises_any_exception
+    Git.expects(:open).raises(ArgumentError)
+    assert_raise RuntimeError do
+      @scm.checkin
+    end
+  end
 end

data/test/unit/github_test.rb

@@ -47,6 +47,30 @@ class GithubTest < Test::Unit::TestCase
     gitignore_file.expects(:puts).with(@scm.gitignore)
     File.expects(:open).with('.gitignore', 'w').yields(gitignore_file)
 
+    URI.expects(:parse).with('https://github.com/api/v2/yaml/repos/create')
+    Net::HTTP.expects(:post_form).with(nil, { 'login' => 'user', 'token' => 'token', 'name' => 'name' })
+
     @scm.checkin
   end
+  
+  def test_checkin_should_raise_RuntimeError_if_any_step_raises_any_exception
+    repo_stub = stub()
+    repo_stub.expects(:add).with('.')
+    repo_stub.expects(:commit).with('Initial commit by Provisional')
+    repo_stub.expects(:config).with('github.user').returns('user')
+    repo_stub.expects(:config).with('github.token').returns('token')
+
+    Git.expects(:open).returns(repo_stub)
+    Dir.expects(:chdir)
+    gitignore_file = stub()
+    gitignore_file.expects(:puts).with(@scm.gitignore)
+    File.expects(:open).with('.gitignore', 'w').yields(gitignore_file)
+
+    URI.expects(:parse).with('https://github.com/api/v2/yaml/repos/create')
+    Net::HTTP.expects(:post_form).with(nil, { 'login' => 'user', 'token' => 'token', 'name' => 'name' }).raises(Net::HTTPUnauthorized)
+
+    assert_raise RuntimeError do
+      @scm.checkin
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vigetlabs-provisional
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Mark Cornick
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-21 00:00:00 -07:00
+date: 2009-04-24 00:00:00 -07:00
 default_executable: provisional
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,7 +92,7 @@ requirements: []
 rubyforge_project: viget
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Automation for new Rails Projects
 test_files: []