auto-gemsets 0.1.6 → 0.1.7

data/Changelog.md

@@ -1,4 +1,9 @@
 #Changelog
 
+## Version 0.1.7
+ - Fixed a bug where calling gemset with -v would error
+ - Set appropriate gem bin directories in PATH
+ - Namespace functions to avoid collisions
+
 ## Version 0.1.6
  - Fixed a bug where the gemset bin path was being duplicated in $PATH

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/auto-gemsets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "auto-gemsets"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
-  s.date = "2012-12-21"
+  s.date = "2012-12-22"
   s.description = "auto-gemsets creates a gemset named after the parent directory of every Gemfile you encounter. This let's you automatically scope your gems without using shims or creating gemsets. "
   s.email = "dnolan@gmail.com"
   s.executables = ["gemset"]

data/auto_gemsets.sh

@@ -1,67 +1,123 @@
-function create_gemset_if_missing() {
-  if [ ! -d "${GEMSET_ROOT}/${GEMSET}" ]; then
-    mkdir -p "${GEMSET_ROOT}/${GEMSET}" && echo "${GEMSET} created. run gem install bundler"
+ag_set_default_gemset() {
+  if [ -n "${DEFAULT_GEMSET}" ]; then
+    if [ ! "$GEM_PATH" == "${DEFAULT_GEMSET}" ]; then
+      DEFAULT=$( basename $DEFAULT_GEMSET )
+    fi
+
+    if [ -n "$GEMSET" ] && [ ! "$GEMSET" == "$DEFAULT" ]; then
+      ag_remove_path "${GEMSET_ROOT}/${GEMSET}/bin"
+    fi
+
+    DEFAULT_BIN_PATH="${DEFAULT_GEMSET}/bin"
+
+    export GEMSET="${DEFAULT}"
+    export GEM_HOME="$DEFAULT_GEMSET"
+    export GEMFILE="$DEFAULT_GEMSET"
+    export GEM_ROOT="$GEM_HOME"
+    export GEM_PATH="$GEM_HOME"
+
+    ag_add_path "$DEFAULT_BIN_PATH"
+    ag_using_gemset_via "*default"
+  fi
+}
+
+ag_using_gemset_via() {
+  echo "Now using $GEMSET gemset via $1"
+}
+
+ag_remove_path() {
+  NEW_PATH=""
+  IFS=':' read -a PATHS <<< "$PATH"
+  for p in "${PATHS[@]}"
+  do
+    if [ ! "$p" == "$1" ]; then
+      if [ -z "$NEW_PATH" ]; then
+        NEW_PATH="$p"
+      else
+        NEW_PATH="$NEW_PATH:$p"
+      fi
+    fi
+  done
+  export PATH="$NEW_PATH"
+}
+
+ag_add_path () {
+  if ! echo $PATH | egrep -q "(^|:)$1($|:)" ; then
+     if [ "$2" = "after" ] ; then
+        PATH=$PATH:$1
+     else
+        PATH=$1:$PATH
+     fi
+
+     export PATH
   fi
 }
 
-function auto_gemsets() {
+auto_gemsets() {
   local dir="$PWD"
-  local version_file
 
   until [[ -z "$dir" ]]; do
-    gemfile="$dir/Gemfile"
-    IFS='/' read -a gemfile_path_parts <<< "$gemfile"
-    gemset="${gemfile_path_parts[${#gemfile_path_parts[@]}-2]}"
-
-    if   [[ "${GEM_PATH//:$DEFAULT_GEMSET}" == "${GEMSET_ROOT}/$gemset" ]]; then return
-    elif [[ -f "$gemfile" ]]; then
-      export GEM_HOME="${GEMSET_ROOT}/$gemset"
-      export GEM_ROOT="${GEMSET_ROOT}/$gemset" # chruby specific
-      export GEM_PATH="${GEM_HOME}:${DEFAULT_GEMSET}"
-      echo "$PATH" | grep -q "${GEMSET_ROOT}/${gemset}/bin" || export PATH="$PATH:${GEMSET_ROOT}/${gemset}/bin"
-      export GEMSET="${gemset}"
-      export GEMFILE="${gemfile}"
-      create_gemset_if_missing && list_gemset
-      break
-    elif [[ ! -f "$gemfile" ]]; then
-      set_default_gemset
+    GEMFILE="$dir/Gemfile"
+
+    if [ -f "$GEMFILE" ]; then
+      ag_get_parent_dirname
+      if [ "$GEMSET" == "$PARENT_DIR" ]; then
+        break
+      else
+        ag_set_gemset "$PARENT_DIR"
+        break
+      fi
+    else
+      if [ ! "$GEMSET" == "$DEFAULT" ]; then
+        ag_set_default_gemset
+      fi
     fi
 
     dir="${dir%/*}"
   done
 }
 
-function set_default_gemset() {
-  if [ ! -z "${DEFAULT_GEMSET}" ]; then
-    if [ ! "$GEM_PATH" == "${DEFAULT_GEMSET}" ]; then
-      export GEM_HOME="$DEFAULT_GEMSET"
-      export GEM_ROOT="$DEFAULT_GEMSET"
-      export GEM_PATH="$DEFAULT_GEMSET"
-      export GEMSET="daytonn"
-      export GEMFILE="*default"
+ag_get_parent_dirname() {
+  IFS='/' read -a gemfile_path_parts <<< "$GEMFILE"
+  PARENT_DIR="${gemfile_path_parts[${#gemfile_path_parts[@]}-2]}"
+}
 
-      echo "$PATH" | grep -q "${DEFAULT_GEMSET}/bin" || export PATH="$PATH:${DEFAULT_GEMSET}/bin"
+ag_set_gemset() {
+  NEW_GEMSET="$1"
+  NEW_GEMSET_PATH="${GEMSET_ROOT}/${1}"
+  NEW_GEMSET_BIN_PATH="${NEW_GEMSET_PATH}/bin"
+  ag_remove_path "$GEMSET_BIN_PATH"
+  ag_create_gemset_if_missing "$NEW_GEMSET"
+  export GEMSET="$NEW_GEMSET"
+  export GEM_HOME="$NEW_GEMSET_PATH"
+  export GEM_ROOT="$NEW_GEMSET_PATH"
+  export GEM_PATH="$NEW_GEMSET_PATH:$DEFAULT_GEMSET"
 
-      if [ -z "$GEMSET_PRELOAD" ]; then
-        list_gemset
-      fi
-    fi
-  fi
+  ag_add_path "$DEFAULT_BIN_PATH"
+  ag_add_path "$NEW_GEMSET_BIN_PATH"
+
+  ag_using_gemset_via "$GEMFILE"
 }
 
-function list_gemset() {
-  echo "Now using ${GEMSET} gemset via ${GEMFILE}"
+ag_create_gemset_if_missing() {
+  if [ ! -d "${GEMSET_ROOT}/${1}" ]; then
+    mkdir -p "${GEMSET_ROOT}/${1}" && echo "${1} created. run gem install bundler"
+  fi
 }
 
+# Create a GEMSET_ROOT if none is set
 if [ ! -n "$GEMSET_ROOT" ]; then
   export GEMSET_ROOT="${HOME}/.gemsets"
 fi
 
+# If ZSH add precommand
 if [[ -n "$ZSH_VERSION" ]]; then
   precmd_functions+=("auto_gemsets")
 else
-  if [[ -n "$PROMPT_COMMAND" ]]; then
-    if [[ ! "$PROMPT_COMMAND" == *auto_gemsets* ]]; then
+  # If there's already a prompt command,
+  if [ -n "$PROMPT_COMMAND" ]; then
+    # check if it's already in the PROMPT
+    if [ ! "$PROMPT_COMMAND" == *auto_gemsets* ]; then
       PROMPT_COMMAND="$PROMPT_COMMAND; auto_gemsets"
     fi
   else
@@ -69,11 +125,5 @@ else
   fi
 fi
 
-function init() {
-  # Set default on load
-  GEMSET_PRELOAD="true"
-  set_default_gemset
-  unset GEMSET_PRELOAD
-}
-
-init
+# Set default when sourced
+ag_set_default_gemset

data/lib/auto-gemsets/application.rb

@@ -36,7 +36,13 @@ module AutoGemsets
       if @command
         self.send @command, *@args
       else
-        options[:help] ? help : self.send(:current)
+        if options[:help]
+          help
+        elsif options[:version]
+          version
+        else
+          self.send(:current)
+        end
       end
     end
 
@@ -139,7 +145,6 @@ module AutoGemsets
         OptionParser.new do |opts|
           opts.on("-v", "--version", "Version info") do
             @options[:version] = true
-            version
           end
 
           opts.on('-h', '--help', 'Display help') do
@@ -155,10 +160,7 @@ module AutoGemsets
       end
 
       def version
-        version = File.read("#{AutoGemsets::base_directory}/VERSION")
-        message = "auto-gemsets #{version}\n"
-        message << "Copyright (c) #{Time.now.year} Dayton Nolan\n"
-        @output.puts message
+        @output.puts "auto-gemsets #{AutoGemsets::VERSION}"
       end
 
       def gemset_path(gemset)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto-gemsets
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3386426079743793721
+      hash: -185994835984614763
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: