metacon 0.1.6 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/lib/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/lib/metacon/command.rb

@@ -95,8 +95,8 @@ module MetaCon
         o.separator cmds
       end
       rest = opts.parse(ARGV)
-      options[:verbose] = true if options[:verbose].nil?
       options[:shell] = false if options[:shell].nil?
+      options[:verbose] = true if options[:verbose].nil?
 
       if rest.size == 0
         puts(opts)

data/lib/metacon/loaders/helpers.rb

@@ -2,11 +2,12 @@ module MetaCon
   module Loaders
     module Helpers
       def included(by); by.extend(self) end
-      def cmd(cmd_string, echo=true)
+      def shcmd(cmd_string, echo=true)
         require 'open3'
         main_out = ''
         err_out = ''
         exit_status = 1
+        $stout.puts(cmd_string) if echo
         Open3.popen3('/usr/bin/env bash -s') do |stdin, stdout, stderr, wth|
           stdin.puts cmd_string
           stdin.flush

data/lib/metacon/loaders/rvm.rb

@@ -18,8 +18,11 @@ module MetaCon
 
 
       RVMS = "source $HOME/.rvm/scripts/rvm && "
+      def self.shc(cmdstr,v); return shcmd("#{RVMS} #{cmdstr}", v) end
 
       def self.switch_ruby(ruby, state, opts={})
+        # TODO: shortcircuit all of this by trying to construct the environment path
+        # and look there first - then do all of this if it doesn't exist.
         unless check_installed(ruby,opts)
           unless install(ruby,opts)
             cfail "Failed to install ruby '#{ruby}'"
@@ -27,7 +30,7 @@ module MetaCon
           end
         end
         gemset = fix_gemset_name(state)
-        unless check_gemset_installed(gemset, opts)
+        unless check_gemset_installed(ruby, gemset, opts)
           unless create_gemset(ruby, gemset, opts)
             cfail "Failed to create a gemset '#{gemset}' for '#{ruby}'"
             return false
@@ -38,27 +41,27 @@ module MetaCon
 
 
       def self.check_installed(ruby, opts)
-        o,e,s = cmd "#{RVMS} rvm use '#{ruby}'", opts[:verbose]
+        o,e,s = shc("rvm use '#{ruby}@'", false)
         return (s==0 && o =~ /using/i)
       end
 
       def self.check_gemset_installed(ruby, gemset, opts)
-        o,e,s = cmd "#{RVMS} rvm use '#{ruby}' && rvm gemset use '#{gemset}'", opts[:verbose]
+        o,e,s = shc("rvm use '#{ruby}'@'#{gemset}'", false)
         return (s == 0 && e.strip.length == 0)
       end
 
       def self.install(ruby, opts)
-        o,e,s = cmd "#{RVMS} rvm install #{ruby}", opts[:verbose]
+        o,e,s = shc("rvm install #{ruby}", opts[:verbose])
         return (s == 0 && check_installed(ruby,opts))
       end
 
       def self.create_gemset(ruby, gemset, opts)
-        o,e,s = cmd "#{RVMS} rvm use '#{ruby}' && rvm gemset create '#{gemset}'", opts[:verbose]
+        o,e,s = shc("rvm use '#{ruby}' && rvm gemset create '#{gemset}'", opts[:verbose])
         res = (o =~ /created/i) && (s == 0) && (e.strip.length == 0)
-        return false unless res
+        return res
+        #return false unless res
         # TODO: Make sure any "permanent" prereqs are loaded (possibly
         # metacon?)
-        return true
       end
 
       def self.switch(ruby, gemset, opts)
@@ -74,11 +77,47 @@ module MetaCon
         #       * Prepend full string w/ 'bash: ' so that it gets evalled in the
         #         current context.
         #       * Enjoy!
+        identstr = `#{RVMS} rvm '#{ruby}'@'#{gemset}' do rvm tools identifier`
+        envsettings = "~/.rvm/environments/#{identstr}"
+        cmds = process_env_commands(IO.readlines(File.expand_path(envsettings)))
+        puts cmds.join("\n") if opts[:shell]
         return true
       end
 
       protected
 
+      def self.process_env_commands(cmdlines,and_exec=true)
+        res = []
+        cmdlines.each do |cl|
+          if cl =~ /^\s*export\s+PATH="([^"]+)"/
+            res << process_path_mod($1.split(':'),and_exec)
+          elsif cl =~ /^\s*unset /
+            res << ":bash #{cl.strip}"
+            ENV.delete(cl.split(/\s+/)[1..-1].join(' ')) if and_exec
+          elsif cl =~ /export /
+            if and_exec
+              val = cl.split("'")[1]
+              name = cl.split('=')[0].strip
+              ENV[name] = val
+            end
+            res << ":bash #{cl.strip}"
+          else
+            raise "Don't know what to do with the environment command: #{cl}"
+          end
+        end
+        return res
+      end
+
+      def self.process_path_mod(parts, and_exec)
+        require 'shellwords'
+        currpath = ENV['PATH'].split(':')
+        parts.delete('$PATH')
+        currpath.select!{|v| v !~ /\/\.rvm\//}
+        rewritten = (parts + currpath).join(':')
+        ENV['PATH'] = rewritten if and_exec
+        return ":bash export PATH=\"#{Shellwords.shellescape(rewritten)}\""
+      end
+
       def self.fix_ruby_version(parts)
         return parts[0].downcase=='head' ? 'ruby-head' : parts.join('-')
       end

data/lib/metacon/stat.rb

@@ -9,7 +9,7 @@ module MetaCon
 
     def self.stat(opts, clo)
       puts '(not yet implemented)'
-      puts curr(opts)
+      puts curr(opts, nil, clo)
     end
 
     def self.curr(opts=[], proj=nil, clo)

data/lib/metacon/switch.rb

@@ -24,7 +24,7 @@ module MetaCon
         when :impossible
           $cli.cfail 'Cannot switch. Probably because submodules need committing.'
         end
-        MetaCon::Stat.curr
+        MetaCon::Stat.curr(opts,$proj,clo)
       end
     end
   end

data/metacon.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "metacon"
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joseph Wecker"]

data/shelp/metacon.bashrc

@@ -4,5 +4,8 @@
 mcon(){
   # Essentially just let metacon do its thing but then do in the current
   # context anything it tells us to do (such as setting environment variables)
-  eval `metacon -s $@ | grep '^:bash' | cut -d' ' -f2-`
+  tmpout=`mktemp /tmp/mc.XXXXXXXX`
+  metacon -s $@ | tee $tmpout | grep -v '^:bash'  # Run & display results
+  eval `grep '^:bash' $tmpout | cut -d' ' -f2-`   # Process any bash commands
+  unlink $tmpout
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metacon
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: god
-  requirement: &2153303960 !ruby/object:Gem::Requirement
+  requirement: &2153799620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153303960
+  version_requirements: *2153799620
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2153303480 !ruby/object:Gem::Requirement
+  requirement: &2153799140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153303480
+  version_requirements: *2153799140
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2153303000 !ruby/object:Gem::Requirement
+  requirement: &2153798660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153303000
+  version_requirements: *2153798660
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153302520 !ruby/object:Gem::Requirement
+  requirement: &2153798180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153302520
+  version_requirements: *2153798180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153302040 !ruby/object:Gem::Requirement
+  requirement: &2153797700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153302040
+  version_requirements: *2153797700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153301560 !ruby/object:Gem::Requirement
+  requirement: &2153797220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2153301560
+  version_requirements: *2153797220
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153301080 !ruby/object:Gem::Requirement
+  requirement: &2153796740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153301080
+  version_requirements: *2153796740
 description: Tool with some similarities to puppet but specializing in fast development
   iteration and continuous deployment. Specifically initially for use with justin.tv
   / twitch.tv project clusters.
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 290890116643417385
+      hash: -1965683250657076444
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: