auto-gemsets 0.1.0 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/auto-gemsets.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "auto-gemsets"
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "auto-gemsets.gemspec",
+    "auto_gemsets.sh",
     "bin/gemset",
-    "gemsets.sh",
     "lib/auto-gemsets.rb",
     "lib/auto-gemsets/application.rb",
     "spec/application_spec.rb",

data/auto_gemsets.sh

@@ -0,0 +1,53 @@
+function create_or_switch_gemset() {
+  if [ ! -d "${GEMSET_ROOT}/${GEMSET}" ]; then
+    mkdir -p "${GEMSET_ROOT}/${GEMSET}" && echo "${GEMSET} created. run gem install bundler"
+  fi
+
+  switch_gemset
+}
+
+function switch_gemset() {
+  export GEM_PATH="${GEMSET_PATH}"
+  export GEM_HOME="${GEMSET_PATH}"
+  export GEM_ROOT="${GEMSET_PATH}"
+  echo "Now using ${GEMSET} gemset via ${GEMFILE}"
+  break
+}
+
+function 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   [[ "${GEMSET_PATH//:$DEFAULT_GEMSET}" == "${GEMSET_ROOT}/$gemset" ]]; then return
+    elif [[ -f "$gemfile" ]]; then
+      export GEMSET_PATH="${GEMSET_ROOT}/$gemset:${DEFAULT_GEMSET}"
+      export GEMSET="${gemset}"
+      export GEMFILE="${gemfile}"
+      create_or_switch_gemset
+    fi
+
+    dir="${dir%/*}"
+  done
+}
+
+if [ ! -n "$GEMSET_ROOT" ]; then
+  export GEMSET_ROOT="${HOME}/.gemsets"
+fi
+
+if [[ -n "$ZSH_VERSION" ]]; then
+  precmd_functions+=("auto_gemsets")
+else
+  if [[ -n "$PROMPT_COMMAND" ]]; then
+    if [[ ! "$PROMPT_COMMAND" == *auto_gemsets* ]]; then
+      PROMPT_COMMAND="$PROMPT_COMMAND; auto_gemsets"
+    fi
+  else
+    PROMPT_COMMAND="auto_gemsets"
+  fi
+fi

data/lib/auto-gemsets/application.rb

@@ -39,7 +39,20 @@ module AutoGemsets
     end
 
     def ls
-      @output.puts Dir.glob(File.join(ENV['HOME'], '.gemsets', '*')).map { |d| File.basename(d) }.join "\n"
+      gemsets = Dir.glob(File.join(ENV['HOME'], '.gemsets', '*')).map do |d|
+        gemset = File.basename(d)
+        default_gemset = File.basename(ENV['DEFAULT_GEMSET'])
+        if gemset == default_gemset
+          gemset = "   #{gemset}*"
+        elsif gemset == ENV['GEMSET']
+          gemset = "-> #{gemset}"
+        else
+          gemset = "   #{gemset}"
+        end
+        gemset
+      end
+
+      @output.puts gemsets.join "\n"
     end
 
     def list
@@ -113,6 +126,11 @@ module AutoGemsets
       end
     end
 
+    def edit
+      raise "You must set $EDITOR or $TERM_EDITOR to edit Gemfiles" unless ENV['EDITOR'] || ENV['TERM_EDITOR']
+      %x{#{ENV['EDITOR'] || ENV['TERM_EDITOR']} #{ENV['GEMFILE']}}
+    end
+
     private
       def parse_options
         @options = {}

data/spec/application_spec.rb

@@ -43,6 +43,18 @@ describe AutoGemsets::Application do
       @output.should_receive(:puts) { |list| expect(list).to match(/#{@gemset}/) }
       @app.list
     end
+
+    it "puts a star on the default gemset" do
+      ENV['DEFAULT_GEMSET'] = @gemset
+      @output.should_receive(:puts) { |list| expect(list).to match(/#{@gemset}\*/) }
+      @app.list
+    end
+
+    it "puts an arrow on the current gemset" do
+      ENV['GEMSET'] = @gemset
+      @output.should_receive(:puts) { |list| expect(list).to match(/-> #{@gemset}/) }
+      @app.list
+    end
   end
 
   describe 'remove' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto-gemsets
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -126,8 +126,8 @@ files:
 - Rakefile
 - VERSION
 - auto-gemsets.gemspec
+- auto_gemsets.sh
 - bin/gemset
-- gemsets.sh
 - lib/auto-gemsets.rb
 - lib/auto-gemsets/application.rb
 - spec/application_spec.rb
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3432436821644449709
+      hash: 2639899487419064898
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/gemsets.sh

@@ -1,98 +0,0 @@
-function create_or_switch_gemset() {
-  if [ ! -d "${GEMSET_PATH}" ]; then
-    mkdir -p "${GEMSET_PATH}"
-    echo "${GEMSET} created. run gem install bundler"
-  fi
-
-  switch_gemset
-}
-
-function switch_gemset() {
-  export GEM_PATH="${GEMSET_PATH}"
-  export GEM_HOME="${GEMSET_PATH}"
-  export GEM_ROOT="${GEMSET_PATH}"
-  echo "Now using ${GEMSET} gemset via ${GEMFILE}"
-  break
-}
-
-function chruby_gemset() {
-  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   [[ "${GEMSET_ROOT}/$gemset" == "$GEMSET_PATH" ]]; then return
-    elif [[ -f "$gemfile" ]]; then
-      export GEMSET_PATH="${GEMSET_ROOT}/$gemset"
-      export GEMSET="${gemset}"
-      export GEMFILE="${gemfile}"
-      create_or_switch_gemset
-    fi
-
-    dir="${dir%/*}"
-  done
-}
-
-function gemplode() {
-
-  if [ ! -z "$1" ]; then
-    echo "${GEMSET_ROOT}/${1}"
-    if [ -d "${GEMSET_ROOT}/${1}" ]; then
-      echo "Are you sure you want to delete the ${1} gemset? y/n"
-      read response
-
-      if [ "$response" == "y" ]; then
-        rm -Rf ${GEMSET_ROOT}/${1}
-        chruby_reset
-      else
-        echo "No gemset removed"
-      fi
-    else
-      echo "No gemset named ${1}"
-    fi
-
-  else
-    echo "Usage:"
-    echo "gemplode (gemset)"
-  fi
-}
-
-function gemset() {
-  if [ -z "$1" ]; then
-    echo "${GEMSET}"
-  else
-    case "$1" in
-      "destroy" )
-        if [ ! -z "$2" ]; then
-          gemplode $2
-        else
-          echo "Usage:"
-          echo "gemset destroy (gemset)"
-        fi
-      ;;
-      "list" )
-        ls -l "${GEMSET_ROOT}"
-      ;;
-    esac
-  fi
-}
-
-if [ ! -n "$GEMSET_ROOT" ]; then
-  export GEMSET_ROOT="${HOME}/.gemsets"
-fi
-
-if [[ -n "$ZSH_VERSION" ]]; then
-  precmd_functions+=("chruby_gemset")
-else
-  if [[ -n "$PROMPT_COMMAND" ]]; then
-    if [[ ! "$PROMPT_COMMAND" == *chruby_gemset* ]]; then
-      PROMPT_COMMAND="$PROMPT_COMMAND; chruby_gemset"
-    fi
-  else
-    PROMPT_COMMAND="chruby_gemset"
-  fi
-fi