RubyGems - metacon - Versions diffs - 0.1.5 → 0.1.6 - Mend

metacon 0.1.5 → 0.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

data/README.rdoc CHANGED Viewed

@@ -8,12 +8,12 @@ running/supervising, branching, aggregating, etc.)
 == Install
 Prerequisites:
-  * git
-  * curl
+* git
+* curl
 The overall tool can be installed as follows:
-  $   bash < <(curl -s https://raw.github.com/josephwecker/metacon/master/shelp/metacon-installer.sh )
+  $   curl -sL http://bit.ly/metacon-inst -o /tmp/mi.sh && bash /tmp/mi.sh
 The library can be used from within a project with a separate:

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.1.5
1	+ 0.1.6

data/bin/metacon CHANGED Viewed

@@ -11,7 +11,7 @@ if File.exists?(rvm_path)
   require 'shellwords'
   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(' ')
+  full_cmd = '/usr/bin/env bash -c \'source "$HOME/.rvm/scripts/rvm" && rvm ruby-1.9.2@metacon do ' + cmd + ' ' + ARGV.map{|a| Shellwords.shellescape(a)}.join(' ') + "'"
   exec full_cmd
 else
   $stderr.puts "RVM is required to run metacon. To finish installation of metacon please run metacon-installer"

data/lib/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.1.5
1	+ 0.1.6

data/metacon.gemspec CHANGED Viewed

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

data/shelp/metacon-installer.sh CHANGED Viewed

@@ -1,10 +1,27 @@
 #!/usr/bin/env bash
-# TODO:
-#  - install the metacon gem (in metacon's ruby+gemset)
-#  - look at output to installation - find full path for .metacon_unwrapped
-#  - make a 'metacon' bin or symlink one that wraps .metacon_unwrapped w/ rvm exec
+cat <<EOF
+metacon-installer
+-----------------
+This will perform the following actions, all of which can be pretty easily
+undone if needed:
+  * Try to install rvm if it's not already installed
+  * Update rvm
+  * Install ruby 1.9.2 (or 1.9.3) safely isolated (by rvm)
+    from your system ruby
+  * Create the rvm gemset that metacon will run under and
+    install some gems into it
+  * Install into it the actual metacon gem
+  * Attempt to make a symlink for the gem's metacon binary
+    in /usr/local/bin to override rubygem's normal
+    executable handling and to make sure it's available no
+    matter what rvm gemset you happen to be in.
+EOF
+read -p "Continue (y/n)? "
+[ "$REPLY" == "y" ] || exit 1
 set -e
@@ -19,6 +36,7 @@ fi
 [[ `git --version` ]] || ( echo "Metacon requires 'git' (git-core package if deb/ubu). Please install and retry." && exit 1 )
 [[ `curl --version` ]] || ( echo "Metaon requires 'curl'. Please install and retry." && exit 1 )
+set +e
 if [[ ! `rvm version` ]]; then
   echo "RVM not found. Attempting to install."
   bash < <(curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer ) || exit 2
@@ -26,10 +44,12 @@ if [[ ! `rvm version` ]]; then
 else
   echo "RVM found"
   INSTALLED_RVM=
+  source "$HOME/.rvm/scripts/rvm"
+  rvm get head
+  rvm reload
 fi
 source "$HOME/.rvm/scripts/rvm"
-set +e
 [[ `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 )
@@ -45,6 +65,7 @@ unlink $GEMOUT
 TMPGEMDIR=`rvm gemdir`
 set +e
+echo "Trying to set up metacon binary in /usr/local/bin"
 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

metadata CHANGED Viewed

@@ -1,142 +1,106 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: metacon
-version: !ruby/object:Gem::Version
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.1.6
   prerelease:
-  segments:
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
 platform: ruby
-authors:
+authors:
 - Joseph Wecker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  version_requirements: &id001 !ruby/object:Gem::Requirement
+date: 2011-10-21 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: god
+  requirement: &2153303960 !ruby/object:Gem::Requirement
     none: false
-    requirements:
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        hash: 51
-        segments:
-        - 0
-        - 11
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.11.0
-  name: god
-  prerelease: false
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency
-  version_requirements: &id002 !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: *2153303960
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &2153303480 !ruby/object:Gem::Requirement
     none: false
-    requirements:
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        hash: 11
-        segments:
-        - 1
-        - 6
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.6.2
-  name: highline
-  prerelease: false
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency
-  version_requirements: &id003 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        hash: 3
-        segments:
-        - 0
-        version: "0"
-  name: minitest
   prerelease: false
+  version_requirements: *2153303480
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2153303000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency
-  version_requirements: &id004 !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: *2153303000
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2153302520 !ruby/object:Gem::Requirement
     none: false
-    requirements:
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        hash: 7
-        segments:
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
-  name: yard
-  prerelease: false
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency
-  version_requirements: &id005 !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: *2153302520
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2153302040 !ruby/object:Gem::Requirement
     none: false
-    requirements:
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        hash: 23
-        segments:
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
-  prerelease: false
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency
-  version_requirements: &id006 !ruby/object:Gem::Requirement
+  prerelease: false
+  version_requirements: *2153302040
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2153301560 !ruby/object:Gem::Requirement
     none: false
-    requirements:
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version
-        hash: 7
-        segments:
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  name: jeweler
-  prerelease: false
   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: *2153301560
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &2153301080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   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.
+  prerelease: false
+  version_requirements: *2153301080
+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-installer
 - metacon
+- metacon-installer
 extensions: []
-extra_rdoc_files:
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files:
+files:
 - .attic/metacon-install
 - .attic/old/.cmd_common
 - .attic/old/Gemfile
@@ -184,33 +148,29 @@ 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
-      hash: 3
-      segments:
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 290890116643417385
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
-      version: "0"
-requirements:
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - git, v1.7.4.1 or greater
 - rvm, v1.8.2 or greater
 - pythonbrew, v1.1 or greater
@@ -220,4 +180,3 @@ signing_key:
 specification_version: 3
 summary: Metacontroller for organizing aggregate projects
 test_files: []