ohmygems 1.1.0 → 1.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fc45fe06cea0f0481abd310161ea5ed4aa9f43da
+  data.tar.gz: d6e877bc5d7dee452f51ceed92ea93387e50851b
+SHA512:
+  metadata.gz: 8659555499cadea2846c9aa3e6b3be9cbe7ed2d70d598c3a86453484950c5f72ee012822e2723fa698f708bc50ae130cb90188ceada22cde244860a3ff398369
+  data.tar.gz: f923169e49491f9a77b38715ea5c09bb5486b581c9aaeb2b5c95370ec7107c7cc555040ede2f2d130f86aa27fa614b0c9e82d94acc89f7dac91cbf7667602617

checksums.yaml.gz.sig

@@ -0,0 +1,2 @@
+n�Z��g�d�'k ��yM���8;:~���&<Gw9�W$֟z�6�%?���zSv�|�<DŽ'���{���Z�_�F0%��e��C�8j�z�bO��Z�n��>&�)��
+�B���R@r>�	7�xXpǴ��2Y���3�yc�L.Gcjh��G�S9�A8�1!l!>ul����_$A8�u�7Xܗ]�9���̪�B@�ל&�

data/History.txt

@@ -1,3 +1,18 @@
+=== 1.2.0 / 2014-06-17
+
+* 6 minor enhancements:
+
+  * Added 'omg env' command to show relevant environment info. (blowmage)
+  * Added OMG_NAME variable to make it easier to program. (blowmage)
+  * Added ohmygems_auto. (blowmage)
+  * Added ohmygems_chruby. (blowmage)
+  * Expanded help and made prettier.
+  * Removed env info from normal repo switch handling. (blowmage)
+
+* 1 bug fix:
+
+  * Put gem PATH item in front of original.
+
 === 1.1.0 / 2013-02-24
 
 * 3 minor enhancements

data/Manifest.txt

@@ -3,3 +3,5 @@ Manifest.txt
 README.txt
 Rakefile
 ohmygems
+ohmygems_auto
+ohmygems_chruby

data/Rakefile

@@ -10,7 +10,7 @@ Hoe.spec "ohmygems" do
 
   license "MIT"
 
-  self.version = "1.1.0"
+  self.version = "1.2.0"
 
   self.post_install_message = <<-"EOM"
 
@@ -18,6 +18,14 @@ Hoe.spec "ohmygems" do
 
       source $(gem env gemdir)/gems/ohmygems-#{self.version}/ohmygems
 
+    If you are using chruby to manage rubies, also add:
+
+      source $(gem env gemdir)/gems/ohmygems-#{self.version}/ohmygems_chruby
+
+    If you want to auto set the gem env with a .ruby-gemset file, add:
+
+      source $(gem env gemdir)/gems/ohmygems-#{self.version}/ohmygems_auto
+
   EOM
 end
 

data/ohmygems

@@ -10,16 +10,20 @@ ohmygems() {
     fi
 
     if [ -z "$name" ]; then
-        echo "usage: ohmygems <name or reset>"
+        echo "usage: ohmygems <cmd or repo>"
         echo
-        echo "  Switches gem home to a (potentially new) named repo."
-        echo "  Your previous gems are still visible,"
-        echo "  but new gem installs will install into ~/.gems/repos/<name>."
-        echo "  Use 'reset' to go back to normal."
+        echo "Commands:"
         echo
-        echo "Available repos in ~/.gem/repos:"
+        echo "  env    = show current state."
+        echo "  reset  = go back to normal state."
+        echo "  <repo> = Switches gem home to a (potentially new) named repo."
+        echo "           Your previous gems are still visible,"
+        echo "           but new gem installs will install into ~/.gem/repos/<name>."
+
+        echo
+        echo "Repos: (in ~/.gem/repos)"
         echo
-        ls ~/.gem/repos | pr -o2 -l1
+        ls ~/.gem/repos | pr -4 -o2 -l1
         echo
         return
     elif [ $name = "reset" ]; then
@@ -33,18 +37,21 @@ ohmygems() {
 
         GEM_PATH=${ORIG_GEM_PATH}
         PATH=$ORIG_PATH
+        unset OMG_NAME
+    elif [ $name = "env" ]; then
+        echo Oh My Gems environment: ${OMG_NAME:-none}
+        echo
+        echo GEM_PATH=${GEM_PATH:-not set}
+        echo GEM_HOME=${GEM_HOME:-not set}
+        echo PATH=$PATH
     else
         echo Switching to $name
 
+        export OMG_NAME=${name}
         export GEM_HOME=~/.gem/repos/${name}
         export GEM_PATH=${ORIG_GEM_HOME}:${ORIG_GEM_PATH}
-        export PATH=${ORIG_PATH}:${GEM_HOME}/bin
+        export PATH=${GEM_HOME}/bin:${ORIG_PATH}
     fi
-
-    echo
-    echo GEM_PATH=${GEM_PATH:-not set}
-    echo GEM_HOME=${GEM_HOME:-not set}
-    echo PATH=$PATH
 }
 
 alias omg=ohmygems

data/ohmygems_auto

@@ -0,0 +1,23 @@
+# -*- sh -*-
+
+function ohmygems_auto() {
+    local dir="$PWD"
+    local gemset
+
+    until [[ -z "$dir" ]]; do
+        if { read -r gemset <"$dir/.ruby-gemset"; } 2>/dev/null || [[ -n "$gemset" ]]; then
+            ohmygems "$gemset"
+            return $?
+        fi
+
+        dir="${dir%/*}"
+    done
+}
+
+if [[ -n "$ZSH_VERSION" ]]; then
+    if [[ ! "$preexec_functions" == *ohmygems_auto* ]]; then
+        preexec_functions+=("ohmygems_auto")
+    fi
+elif [[ -n "$BASH_VERSION" ]]; then
+    trap '[[ "$BASH_COMMAND" != "$PROMPT_COMMAND" ]] && ohmygems_auto' DEBUG
+fi

data/ohmygems_chruby

@@ -0,0 +1,31 @@
+# Reload ohmygems when chruby is called.
+# Inspired by chruby's after hook wiki:
+# https://github.com/postmodern/chruby/wiki/Implementing-an-'after-use'-hook
+
+save_function() {
+    local ORIG_FUNC=$(declare -f $1)
+    local NEWNAME_FUNC="$2${ORIG_FUNC#$1}"
+    eval "$NEWNAME_FUNC"
+}
+
+save_function chruby ohmygems_chruby
+
+function chruby () {
+    # Are we in a gemset?
+    omg_name=${OMG_NAME}
+
+    # Reset ohmygems
+    ohmygems reset
+    # Including removing the ENV variables
+    unset ORIG_GEM_PATH
+    unset ORIG_GEM_HOME
+    unset ORIG_PATH
+
+    # Switch ruby
+    ohmygems_chruby $*
+
+    # Reload gem repo after switching rubies
+    if [ -n "$omg_name" ]; then
+        ohmygems ${omg_name}
+    fi
+}

metadata

@@ -1,24 +1,18 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ohmygems
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: 
+cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  GRYDY29tMB4XDTEzMDkxNjIzMDQxMloXDTE0MDkxNjIzMDQxMlowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -28,61 +22,57 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
-  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
-  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
-  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
-  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
-  FBHgymkyj/AOSqKRIpXPhjC6
+  AQCFZ7JTzoy1gcG4d8A6dmOJy7ygtO5MFpRIz8HuKCF5566nOvpy7aHhDDzFmQuu
+  FX3zDU6ghx5cQIueDhf2SGOncyBmmJRRYawm3wI0o1MeN6LZJ/3cRaOTjSFy6+S6
+  zqDmHBp8fVA2TGJtO0BLNkbGVrBJjh0UPmSoGzWlRhEVnYC33TpDAbNA+u39UrQI
+  ynwhNN7YbnmSR7+JU2cUjBFv2iPBO+TGuWC+9L2zn3NHjuc6tnmSYipA9y8Hv+As
+  Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
+  xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-
-date: 2013-02-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-06-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 4
-        - 6
-        version: "4.6"
+      - !ruby/object:Gem::Version
+        version: '5.3'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 3
-        - 5
-        version: "3.5"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 description: |-
   I'm tired of the complications that tools like bundler and rvm inject
   into my system and my workflow. I don't want 4 billion gems installed
@@ -90,71 +80,71 @@ description: |-
   don't want rvm to regress on undefined variables over and over and
   over (and I don't want to report it anymore when it does). I want as
   much simplicity as I can afford and still be able to get my job done.
-  
+
   I've found pretty good balance using rbenv (only when needed) and by
   using this 45 line shell function `ohmygems` (aliased to `omg`, of
   course).
-  
+
   I still have my system-level gems as my previous GEM_HOME gets moved
   into GEM_PATH so things like minitest and autotest are always
   available. But now I have private gems that are incredibly easy to
   switch around and only rely on simple environment variables to manage.
-  
+
   To go back to normal, simply run `omg reset`.
-email: 
+email:
 - ryand-ruby@zenspider.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - History.txt
 - Manifest.txt
 - README.txt
 - Rakefile
 - ohmygems
+- ohmygems_auto
+- ohmygems_chruby
 homepage: https://github.com/seattlerb/ohmygems
-licenses: 
+licenses:
 - MIT
-post_install_message: |+
-  
+metadata: {}
+post_install_message: |2+
+
       Add the following to your ~/.bashrc or equivalent:
-  
-        source $(gem env gemdir)/gems/ohmygems-1.1.0/ohmygems
-  
-rdoc_options: 
+
+        source $(gem env gemdir)/gems/ohmygems-1.2.0/ohmygems
+
+      If you are using chruby to manage rubies, also add:
+
+        source $(gem env gemdir)/gems/ohmygems-1.2.0/ohmygems_chruby
+
+      If you want to auto set the gem env with a .ruby-gemset file, add:
+
+        source $(gem env gemdir)/gems/ohmygems-1.2.0/ohmygems_auto
+
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: ohmygems
-rubygems_version: 1.8.25
+rubyforge_project: 
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
-summary: I'm tired of the complications that tools like bundler and rvm inject into my system and my workflow
+specification_version: 4
+summary: I'm tired of the complications that tools like bundler and rvm inject into
+  my system and my workflow
 test_files: []
-