ors 0.2.9 → 0.2.10

data/lib/ors/commands/ruby.rb

@@ -0,0 +1,8 @@
+module ORS::Commands
+  class Ruby < Base
+    def execute
+      info "setting up ruby/rubygems for #{name} #{environment}..."
+      execute_in_parallel(ruby_servers) {|server| setup_ruby server }
+    end
+  end
+end

data/lib/ors/commands/setup.rb

@@ -6,9 +6,10 @@ module ORS::Commands
       info "setting up #{name} #{environment}..."
 
       info "Are you sure? ('yes' + ctrl+D^2)"
-      if STDIN.read == "yes"
+      if pretending || STDIN.read == "yes"
         execute_in_parallel(all_servers) {|server| setup_repo server }
-        execute_in_parallel(ruby_servers) {|server| setup_ruby server }
+
+        run Ruby
 
         execute_command migration_server, prepare_environment,
                                           %(RAILS_ENV=#{environment} bundle exec rake db:create)

data/lib/ors/config.rb

@@ -58,7 +58,7 @@ module ORS
       private
 
       def name_from_git
-        git.config["remote.origin.url"].gsub /.*?:(.*?).git/, '\1'
+        git.config["remote.origin.url"].gsub(/^[\w]*(@|:\/\/)[^\/:]*(\/|:)([a-zA-Z0-9\/]*)(.git)?$/i, '\3')
       end
 
     end

data/lib/ors/helpers.rb

@@ -16,7 +16,7 @@ module ORS
     def setup_ruby server
       info "[#{server}] installing ruby and gems..."
 
-      execute_command server, prepare_environment,
+      execute_command server, prepare_initial_environment,
                               %(gem install rubygems-update),
                               %(gem update --system),
                               %(gem install bundler),
@@ -128,6 +128,18 @@ module ORS
       end
     end
 
+    def prepare_initial_environment
+      # We do 2 cd's and a git checkout here because the master
+      # branch may not always contain the proper rvmrc/Gemfile
+      # we need when setting up the rest of the deploy
+      prepare_environment + [
+                             %(git checkout -q -f origin/#{environment}),
+                             %(git reset --hard),
+                             %(cd ../),
+                             %(cd #{deploy_directory})
+                            ]
+    end
+
     def prepare_environment
       [%(source ~/.rvm/scripts/rvm),
        %({ cd #{deploy_directory} > /dev/null; })] # Silence RVM's "Using... gemset..."

data/lib/ors/version.rb

@@ -1,3 +1,3 @@
 module ORS
-  VERSION = "0.2.9"
+  VERSION = "0.2.10"
 end

data/spec/ors/config_spec.rb

@@ -97,4 +97,21 @@ describe ORS::Config do
     end
   end
 
+  context "#name_from_git" do
+    {
+     "git://github.com/testing/github.git" => "testing/github",
+     "git://example.com/testing/gitlabhq.git" => "testing/gitlabhq",
+     "git://github.com/testing/github" => "testing/github",
+     "git@github.com:testing/github" => "testing/github",
+     "git@ghub.com:testing/gitlabhq.git" => "testing/gitlabhq",
+     "git@ghub.com:gitlabhq.git" => "gitlabhq",
+     "git://ghub.com/gitlabhq.git" => "gitlabhq"
+    }.each do |remote, name|
+      it "should handle a remote origin url such as #{remote}" do
+        mock(ORS::Config).git { mock!.config { {"remote.origin.url" => remote} }}
+        ORS::Config.send(:name_from_git).should == name
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ors
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000 -04:00
+date: 2012-03-31 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &2156629660 !ruby/object:Gem::Requirement
+  requirement: &2160301940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156629660
+  version_requirements: *2160301940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156623220 !ruby/object:Gem::Requirement
+  requirement: &2160301520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156623220
+  version_requirements: *2160301520
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2156621220 !ruby/object:Gem::Requirement
+  requirement: &2160301080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156621220
+  version_requirements: *2160301080
 description: Heroku-like deployment utilities for ORS
 email:
 - jason.dew@ors.sc.gov and john.long@ors.sc.gov
@@ -73,6 +73,7 @@ files:
 - lib/ors/commands/logs.rb
 - lib/ors/commands/migrate.rb
 - lib/ors/commands/restart.rb
+- lib/ors/commands/ruby.rb
 - lib/ors/commands/runner.rb
 - lib/ors/commands/setup.rb
 - lib/ors/commands/start.rb