metacon 0.1.4 → 0.1.5

data/Rakefile

@@ -49,3 +49,9 @@ task :default => :test
 
 require 'yard'
 YARD::Rake::YardocTask.new
+
+desc 'For testing binaries in development'
+task :local_bin do
+  sh 'rm -f /usr/local/bin/metacon'
+  sh "ln -s #{File.dirname(File.expand_path(__FILE__))}/bin/metacon /usr/local/bin/metacon"
+end

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/bin/metacon

@@ -5,11 +5,12 @@
 # TODO: Not finding .metacon_unwrapped properly when symlinked! (true-absolute __FILE__ before dirname etc.)
 # TODO: Make sure full environment is set up- not just rvm installed
 #
-
+require 'pathname'
 rvm_path = File.expand_path("~/.rvm/scripts/rvm")
 if File.exists?(rvm_path)
   require 'shellwords'
-  cmd = Shellwords.shellescape(File.join(File.dirname(File.realdirpath(__FILE__)), '.metacon_unwrapped'))
+  cmd = Shellwords.shellescape(
+    File.join(File.dirname(Pathname.new(__FILE__).realpath.to_s), '.metacon_unwrapped'))
   full_cmd = '. "$HOME/.rvm/scripts/rvm" && rvm ruby-1.9.2@metacon exec ' + cmd + ' ' + ARGV.map{|a| Shellwords.shellescape(a)}.join(' ')
   exec full_cmd
 else

data/lib/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/metacon/command.rb

@@ -76,11 +76,15 @@ module MetaCon
         o.version = MetaCon.version
         o.banner = banner
         o.separator ''
-        o.on('-v', '--[no-]verbose', 'Run command verbosely'){|v| options[:verbose]=v}
+        o.on('-q', '--[no-]quiet', 'Run command quietly'){|v| options[:verbose]= !v}
 
         o.on('-h','--help', 'Show this message'){puts o; exit 0}
         o.on('--version', 'Show version and exit'){puts MetaCon::VERSION; exit 0}
 
+        o.on('-s', '--[no-]shell-output', 'Outputs commands for evaluating in the current shell') do |v|
+          options[:shell]=v
+        end
+
         o.separator ''
         o.separator 'commands          '
         o.separator '------------------'
@@ -91,30 +95,36 @@ module MetaCon
         o.separator cmds
       end
       rest = opts.parse(ARGV)
+      options[:verbose] = true if options[:verbose].nil?
+      options[:shell] = false if options[:shell].nil?
 
       if rest.size == 0
-        puts opts
+        puts(opts)
         exit
       end
+
       command_key = rest.shift.strip.downcase
       command = CMD_ALIASES[command_key.to_sym]
-
       if command.nil?
         cfail "Command #{command_key} not found. Use -h to see the list of commands."
         exit 2
       end
+
       $cli = HighLine.new
       $cli.extend(MetaCon::CLIHelpers)
       unless command == :init
-        $proj = MetaCon::Project.new
-        $cli.cfail 'Not a metacon project. Use `metacon init`' and exit(5) unless $proj.valid
+        $proj = MetaCon::Project.new('./', options[:verbose])
+        unless $proj.valid
+          $cli.cfail 'Not a metacon project. Use `metacon init`'
+          exit 5
+        end
       end
 
       command_info = COMMANDS.select{|k,v| k == command}[0][1]
-      command_info[:handler].send :handle, command, rest
+      command_info[:handler].send :handle, command, options, rest
     end
 
-    def self.handle(cmd,opts)
+    def self.handle(cmd,clo,opts)
       if cmd == :conf
         conf = $proj.conf
         conf = Hash[opts.map{|fam| [fam, conf[fam]]}] if opts.size > 0

data/lib/metacon/init.rb

@@ -1,7 +1,7 @@
 module MetaCon
   class Init
     require 'fileutils'
-    def self.handle(_cmd, opts)
+    def self.handle(_cmd, clo, opts)
       dir = opts.shift
       dir ||= './'
       # Find out if different roles are specified. If none- default to primary.
@@ -23,8 +23,8 @@ module MetaCon
       end
       FileUtils.mkdir(mcd)
 
-      $cli.status "Initializing..."
-      mcp = MetaCon::Project.new(mcd)
+      $cli.status "Initializing..." if clo[:verbose]
+      mcp = MetaCon::Project.new(mcd, clo[:verbose])
 
       init_role = mcp.list(:role)[0] || 'main'
       init_rtc  = mcp.list(:rtc)[0] || 'dev'
@@ -33,7 +33,7 @@ module MetaCon
         $cli.cfail 'Cannot initialize the metacontext- submodules need to have files committed.'
         exit 4
       end
-      $cli.result "\"#{dir}\" is now a metacon project"
+      $cli.result "\"#{dir}\" is now a metacon project" if clo[:verbose]
     end
   end
 end

data/lib/metacon/loaders/rvm.rb

@@ -4,11 +4,11 @@ module MetaCon
       require 'metacon/loaders/helpers'
       include MetaCon::Loaders::Helpers
       include MetaCon::CLIHelpers
-      def self.ensure(dep, state, proj, v=true)
-        kind = dep.shift
+      def self.load_dependency(dependency_parts, state, proj, opts)
+        kind = dependency_parts.shift
         if kind == 'ruby'
-          vstr = dep[0].downcase=='head' ? 'ruby-head' : dep.join('-')
-          switch_ruby(vstr)
+          ruby = fix_ruby_version(dependency_parts)
+          return switch_ruby(ruby, state, opts)
         elsif kind == 'gem'
 
         else
@@ -16,22 +16,79 @@ module MetaCon
         end
       end
 
-      def self.switch_ruby(version, v=true)
-        # TODO: Be sure and always select a gemset
-        # TODO: Make sure metacon is always installed in that gemset
-        select_res, err_txt, st = cmd "rvm use '#{version}'", v
-        select_res += err_txt
-        if st == 0 && select_res =~ /rvm install (.*)/
-          real_version = $1
-          if install_ruby(real_version,v) then return switch_ruby(real_version)
-          else return(false) end
-        elsif select_res =~ /Using/i then return true
-        else return(false) end
+
+      RVMS = "source $HOME/.rvm/scripts/rvm && "
+
+      def self.switch_ruby(ruby, state, opts={})
+        unless check_installed(ruby,opts)
+          unless install(ruby,opts)
+            cfail "Failed to install ruby '#{ruby}'"
+            return false
+          end
+        end
+        gemset = fix_gemset_name(state)
+        unless check_gemset_installed(gemset, opts)
+          unless create_gemset(ruby, gemset, opts)
+            cfail "Failed to create a gemset '#{gemset}' for '#{ruby}'"
+            return false
+          end
+        end
+        return switch(ruby, gemset, opts)
+      end
+
+
+      def self.check_installed(ruby, opts)
+        o,e,s = cmd "#{RVMS} rvm use '#{ruby}'", opts[:verbose]
+        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]
+        return (s == 0 && e.strip.length == 0)
+      end
+
+      def self.install(ruby, opts)
+        o,e,s = cmd "#{RVMS} 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]
+        res = (o =~ /created/i) && (s == 0) && (e.strip.length == 0)
+        return false unless res
+        # TODO: Make sure any "permanent" prereqs are loaded (possibly
+        # metacon?)
+        return true
+      end
+
+      def self.switch(ruby, gemset, opts)
+        # TODO: if the --shell flag is sent in, essentially do the following:
+        #       * Use rvm info to figure out the correct root directory
+        #       * Find .rvm/environments/... for the currently selected ruby+gemset
+        #       * Compare actual $PATH to what it would need to change to so that we
+        #         don't keep prepending to PATH and growing it needlessly on every
+        #         switch.
+        #       * Create replacement 'export path' stmt
+        #       * Take all stmts and concatenate w/ ';' and shell escape where
+        #         appropriate (esp. newlines at least)
+        #       * Prepend full string w/ 'bash: ' so that it gets evalled in the
+        #         current context.
+        #       * Enjoy!
+        return true
+      end
+
+      protected
+
+      def self.fix_ruby_version(parts)
+        return parts[0].downcase=='head' ? 'ruby-head' : parts.join('-')
+      end
+
+      def self.fix_gemset_name(state)
+        return "mcon_#{clean(state[:rtc])}__#{clean(state[:role])}"
       end
 
-      def self.install_ruby(version, v=true)
-        inst_res, err_txt, st = cmd "rvm install '#{version}'", v
-        return st == 0 && err_text.strip.length == 0
+      def self.clean(s)
+        s.gsub /[^a-zA-Z0-9_]+/, '_'
       end
     end
   end

data/lib/metacon/project.rb

@@ -17,7 +17,8 @@ module MetaCon
       @uid
     end
 
-    def initialize(relative_to='./')
+    def initialize(relative_to='./', verbose=true)
+      @verbose = verbose
       @rel_dir = File.expand_path(relative_to)
       @mc_dir = Project.find_mc_dir(@rel_dir)
       if @mc_dir.nil?
@@ -45,7 +46,10 @@ module MetaCon
       @this_host
     end
 
-    def switch(verbose=false,changes={})
+    # Options that it cares about:
+    #   - :verbose   true/false
+    #   - :shell     true/false
+    def switch(changes={},opts={})
       return :nochange if changes=={}
       return :impossible unless can_switch?
       changed = false
@@ -56,7 +60,7 @@ module MetaCon
         changed = s.dirty
       end
       if changed
-        return setup_context(verbose)
+        return setup_context(opts)
       else
         return :nochange
       end
@@ -93,22 +97,25 @@ module MetaCon
 
     def refresh_conf; @config = Config.new(@root_dir) end
 
-    def setup_context(verbose=false)
+    def setup_context(opts)
       dependencies = self.conf['dependencies']
       incomplete = false
       dependencies.each do |dep|
+        orig_dep = dep.dup
         dep = dep.split('/').map{|part| part.strip}
         kind = dep[0].downcase
         loader = LOADERS[kind]
         if loader.nil?
-          $stderr.puts "WARNING: Don't know how to work with '#{kind}' dependencies." if verbose
+          $stderr.puts "WARNING: Don't know how to work with '#{kind}' dependencies." if opts[:verbose]
           incomplete = true
         else
-          loader.ensure(dep, @state.state, self)
+          unless loader.load_dependency(dep, @state.state, self, opts)
+            $stderr.puts "ERROR: Failed to load #{orig_dep} - continuing anyway"
+            incomplete = true
+          end
         end
       end
       return incomplete ? :incomplete : :switched
-      # TODO: Handle :incomplete in calling modules
     end
   end
 

data/lib/metacon/stat.rb

@@ -1,18 +1,18 @@
 module MetaCon
   class Stat
-    def self.handle(cmd, opts)
+    def self.handle(cmd, clo, opts)
       case cmd
-      when :stat; stat(opts)
-      when :curr; curr(opts)
+      when :stat; stat(opts, clo)
+      when :curr; curr(opts, nil, clo)
       end
     end
 
-    def self.stat(opts)
+    def self.stat(opts, clo)
       puts '(not yet implemented)'
       puts curr(opts)
     end
 
-    def self.curr(opts=[], proj=nil)
+    def self.curr(opts=[], proj=nil, clo)
       proj ||= $proj
       $cli.cfail 'Not a metacon project. Use `metacon init`' and exit(5) unless proj.valid
       state = proj.current_state

data/lib/metacon/switch.rb

@@ -1,6 +1,6 @@
 module MetaCon
   class Switch
-    def self.handle(cmd, opts)
+    def self.handle(cmd, clo, opts)
       if opts.nil? or opts.size == 0
         all = $proj.list(cmd)
         current = $proj.current_state[cmd]
@@ -12,12 +12,15 @@ module MetaCon
           end
         end
       else
-        res = $proj.switch(true, {cmd=>opts[0]})
+        res = $proj.switch({cmd=>opts[0]}, clo)
         case res
         when :nochange
-          $cli.cwarn 'Nothing changed'
+          $cli.cwarn 'Nothing changed' if clo[:verbose]
         when :switched
-          $cli.result "Switched #{cmd} to '#{opts[0]}'"
+          $cli.result "Switched #{cmd} to '#{opts[0]}'" if clo[:verbose]
+        when :incomplete
+          $cli.cwarn "Not all dependencies loaded."
+          $cli.result "Switched #{cmd} to '#{opts[0]}' more or less." if clo[:verbose]
         when :impossible
           $cli.cfail 'Cannot switch. Probably because submodules need committing.'
         end

data/metacon.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "metacon"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joseph Wecker"]
-  s.date = "2011-10-20"
+  s.date = "2011-10-21"
   s.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."
   s.email = "jwecker@justin.tv"
-  s.executables = [".metacon_unwrapped", "metacon", "metacon-installer"]
+  s.executables = [".metacon_unwrapped", "metacon-installer", "metacon"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"

data/shelp/metacon-installer.sh

@@ -30,20 +30,25 @@ fi
 
 source "$HOME/.rvm/scripts/rvm"
 set +e
-rvm use $MCON_RUBY_V || ( rvm install $MCON_RUBY_V && rvm use $MCON_RUBY_V ) || exit 3
-echo `rvm current`
-rvm gemset use metacon || ( rvm gemset create metacon && rvm gemset use metacon ) || exit 3
+[[ `rvm use $MCON_RUBY_V` == *Using* ]] || ( rvm install $MCON_RUBY_V && rvm use $MCON_RUBY_V ) || exit 3
+rvm use $MCON_RUBY_V
+[[ `rvm use $MCON_RUBY_V; rvm gemset use metacon 2>&1` == *ERROR* ]] && ( ( rvm use $MCON_RUBY_V && rvm gemset create metacon && rvm gemset use metacon ) || exit 3 )
+rvm gemset use metacon
+rvm current
 rvm --force gemset empty metacon || exit 3
-echo `rvm current`
 
 set -e
 GEMOUT=`mktemp /tmp/metacon.XXXXXX`
-gem install metacon | tee $GEMOUT
+gem install metacon | grep -v metacon-installer | grep -v "^$" | tee $GEMOUT
 DIRNAME=`grep 'Successfully installed metacon-' $GEMOUT | cut -d' ' -f3`
 unlink $GEMOUT
+TMPGEMDIR=`rvm gemdir`
 
-rm -f /usr/local/bin/metacon /usr/local/bin/.metacon_unwrapped
-ln -s `rvm gemdir`/gems/${DIRNAME}/bin/metacon /usr/local/bin/metacon
+set +e
+rm -f /usr/local/bin/metacon &> /dev/null || sudo rm -f /usr/local/bin/metacon
+ln -s ${TMPGEMDIR}/gems/${DIRNAME}/bin/metacon /usr/local/bin/metacon &> /dev/null || \
+  sudo ln -s ${TMPGEMDIR}/gems/${DIRNAME}/bin/metacon /usr/local/bin/metacon
+set -e
 
 if [ $INSTALLED_RVM ]; then
 	echo "To finish installing RVM you need to add the following to your .bashrc (or .bash_profile etc.) - then restart the shell."

data/shelp/metacon.bashrc

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
-# NOTE: make sure not to show role in prompt if no role differentiation is
-# used.
+# TODO: make sure not to show role in prompt if no role differentiation is used.
 
-echo 'hello'
+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-`
+}

metadata

@@ -1,106 +1,142 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: metacon
-version: !ruby/object:Gem::Version
-  version: 0.1.4
+version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 5
+  version: 0.1.5
 platform: ruby
-authors:
+authors: 
 - Joseph Wecker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: god
-  requirement: &2153230080 !ruby/object:Gem::Requirement
+
+date: 2011-10-21 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 11
+        - 0
         version: 0.11.0
-  type: :runtime
+  name: god
   prerelease: false
-  version_requirements: *2153230080
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: &2153229600 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 6
+        - 2
         version: 1.6.2
-  type: :runtime
+  name: highline
   prerelease: false
-  version_requirements: *2153229600
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: &2153229120 !ruby/object:Gem::Requirement
+  type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: minitest
   prerelease: false
-  version_requirements: *2153229120
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2153228640 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-  type: :development
+  name: yard
   prerelease: false
-  version_requirements: *2153228640
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2153228160 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
+  name: bundler
   prerelease: false
-  version_requirements: *2153228160
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2153244040 !ruby/object:Gem::Requirement
+  type: :development
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
         version: 1.6.4
-  type: :development
+  name: jeweler
   prerelease: false
-  version_requirements: *2153244040
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2153243560 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rcov
   prerelease: false
-  version_requirements: *2153243560
-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.
+  type: :development
+  requirement: *id007
+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.
 email: jwecker@justin.tv
-executables:
+executables: 
 - .metacon_unwrapped
-- metacon
 - metacon-installer
+- metacon
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .attic/metacon-install
 - .attic/old/.cmd_common
 - .attic/old/Gemfile
@@ -148,29 +184,33 @@ files:
 - test/helper.rb
 - test/test_metacon.rb
 homepage: http://github.com/josephwecker/metacon
-licenses:
+licenses: 
 - MIT
-post_install_message: ! "\n\n\e[1;32m\e[40m--- You may need to run \e[1;37mmetacon-installer\e[1;32m
-  to check dependencies & finish the installation --- \e[0m\n\n"
+post_install_message: "\n\n\
+  \e[1;32m\e[40m--- You may need to run \e[1;37mmetacon-installer\e[1;32m to check dependencies & finish the installation --- \e[0m\n\n"
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 365216294395297813
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: 
 - git, v1.7.4.1 or greater
 - rvm, v1.8.2 or greater
 - pythonbrew, v1.1 or greater
@@ -180,3 +220,4 @@ signing_key:
 specification_version: 3
 summary: Metacontroller for organizing aggregate projects
 test_files: []
+