auto-gemsets 0.3.0 → 0.4.0

data/Changelog.md

@@ -1,5 +1,18 @@
 #Changelog
 
+## Version 0.4.0 (unreleased)
+  - Create default gemset if one does not exist
+  - Complete shunit2 test suite coverage (and subsequent refactor/overhall)
+  - Default gemset is now simply called default
+  - Renamed `/usr/local/share/auto_gemsets` to `/usr/local/share/auto-gemsets`
+  - Added configuration file `~/.auto-gemsets` to turn on/off reporting
+  - `gemset init` creates `auto-gemsets.sh`, `default-gems.sh`, and `.auto-gemsets`
+  - `gemset init` creates the default gemset
+  
+## Version 0.3.0
+  - No longer setting the auto_gemsets.sh file as executable
+  - Change `default-gemsets` to `default-gems`
+
 ## Version 0.2.1
   - add `init` command
 

data/HELP.md

@@ -22,7 +22,7 @@ Commands:
 
 init
 ----
-This command will copy the auto_gemsets.sh script into the `/usr/local/share/auto_gemsets` folder. This is the small shell script that does the automatic switching for you. Once this file is in place, simply `source` it somewhere in your profile and auto-gemsets will be activated.
+This command will copy the auto-gemsets.sh script into the `/usr/local/share/auto-gemsets` folder. This is the small shell script that does the automatic switching for you. Once this file is in place, simply `source` it somewhere in your profile and auto-gemsets will be activated.
 
 ls, list
 --------

data/README.md

@@ -14,22 +14,31 @@ Any `Gemfile` you encounter will cause auto-gemsets to automatically create and
 
 ### Configuration:
 
-The `gemset init` command will create a copy of `auto_gemsets.sh` into `/usr/local/share/auto_gemsets` To use auto-gemsets, you will need to source this file in your `~/.bashrc` (`~/.bash_profile` on OSX) or `~/.zshrc` file.
+The `gemset init` command will create a copy of `auto-gemsets.sh` and `default-gems.sh` into `/usr/local/share/auto-gemsets` To use auto-gemsets, you will need to source these files in your `~/.bashrc` (`~/.bash_profile` on OSX) or `~/.zshrc` file.
 
-    source /usr/local/share/auto_gemsets/auto_gemsets.sh
+    source /usr/local/share/auto-gemsets/auto-gemsets.sh
+    source /usr/local/share/auto-gemsets/default-gems.sh
+    
+In addition to these two scripts, `init` also creates a `~/.auto-gemsets` config file to allow for customization of `auto-gemsets`.
+    
+Once you source `.bashrc`, `.bash_profile`, or `~/.zshrc` (`source ~/.bashrc`) or open a new terminal auto-gemsets will now be active and managing your ruby gems.
 
-That's it, reload your `.bashrc` (`source ~/.bashrc`) or open a new terminal and auto-gemsets will now be managing your ruby gems environment.
+Since, `auto-gemsets` creates a new default gemset, you will need to reinstall `auto-gemsets` to use the `gemset` command.
 
-NOTE: If you've already installed `auto-gemsets` you will receive a warning asking you if you wish to overwrite this installation. You may want to do this after updating your `auto-gemsets` version
+    gem install auto-gemsets
+
+A NOTE ON UPGRADING: If you've already installed `auto-gemsets` you will receive a warning asking you if you wish to overwrite this installation. You may want to do this after updating your `auto-gemsets` version
 
 ### Default Gemset:
 
-If you wish to have certain gems available globally no matter what project you're in, you may set a `DEFAULT_GEMSET` variable that points to a gemset directory that will be available no matter what specific project gemset is currently in use. To set a default gemset simply add the `DEFAULT_GEMSET` variable in your `.bashrc` or `.zshrc` file (it must be a valid path):
+A default gemset will be created for you when you run `gemset init` in `~/.gemsets/default`.
+
+If you wish to override this location simply set the `DEFAULT_GEMSET` variable somewhere in your `.bashrc`, `.bash_profile`, or `.zshrc` depending on your environment:
 
     # auto-gemsets
-    export DEFAULT_GEMSET="$HOME/.gemsets/$USER"
+    export DEFAULT_GEMSET="/custom/path/to/default_gemset"
 
-auto-gemsets will add this gemset to your `GEM_PATH` and add it's bin directory to your `PATH`. This gemset will always be active. When another gemset is also active, installed gems will automatically belong to that gemset. When _ONLY_ the default gemset is active, installed gems will belong to the default gemset.
+auto-gemsets will add this gemset to your `GEM_PATH` and add it's bin directory to your `PATH`. This gemset will always be active. When another gemset is also active, installed gems will automatically belong to that gemset. When _ONLY_ the `default` gemset is active, installed gems will belong to the `default` gemset.
 
 ## Command Line
 
@@ -37,19 +46,27 @@ Although auto-gemsets focuses on automatic management of your gemsets, there are
 
 See the [HELP](https://github.com/daytonn/auto-gemsets/blob/master/HELP.md) file for `gemset`'s Documentation.
 
+There is also a utility that allows you to isolate your `default` gemset when running gem commands named `default-gems`
+
+For more documentation simply type
+
+    default-gems
+
 ## default-gems
-The defalt-gemset command is an auto-gems utility to manage gems
+The defalt-gems command is an auto-gemsets utility to manage gems
 in the default* gemset from within other gemsets.
 
-### Usage:
+Usage:
+------
 
-    default-gems (command) [options]
+  default-gems (command) [options]
 
-### Examples:
+Examples:
+---------
 
-    default-gems install rake
-    default-gems uninstall rake -v=10.0.1
-    default-gems list --local
+  default-gems install mygem
+  default-gems uninstall mygem
+  default-gems list
 
-`default-gems` accepts any valid `gem` command, with any valid arguments and options.
-It is simply a pass-through to the `gem` command with the context of the default gemset.
+default-gems accepts any valid gem command, with any valid arguments and options.
+It is simply a pass-through to the gem command with the context of the default gemset.

data/Rakefile

@@ -47,3 +47,12 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+
+namespace :sh do
+
+  task :test do
+    puts %x{sh test/runner}
+  end
+
+end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/auto-gemsets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "auto-gemsets"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
-  s.date = "2013-01-05"
+  s.date = "2013-01-07"
   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"]
@@ -29,11 +29,22 @@ Gem::Specification.new do |s|
     "auto-gemsets.gemspec",
     "bin/gemset",
     "lib/auto-gemsets.rb",
+    "lib/auto-gemsets/.auto-gemsets",
     "lib/auto-gemsets/application.rb",
-    "lib/auto-gemsets/auto_gemsets.sh",
+    "lib/auto-gemsets/auto-gemsets.sh",
+    "lib/auto-gemsets/default-gems.sh",
     "spec/application_spec.rb",
     "spec/auto-gemsets_spec.rb",
     "spec/spec_helper.rb",
+    "test/ag_add_path_test.sh",
+    "test/ag_init_test.sh",
+    "test/ag_parent_dir_test.sh",
+    "test/ag_remove_path_test.sh",
+    "test/ag_set_gemset_test.sh",
+    "test/auto_gemsets_test.sh",
+    "test/helper.sh",
+    "test/project/Gemfile",
+    "test/runner",
     "travis.yml"
   ]
   s.homepage = "http://github.com/daytonn/auto-gemsets"

data/lib/auto-gemsets.rb

@@ -1,7 +1,7 @@
 module AutoGemsets
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
   GEMSET_ROOT = ENV['GEMSET_ROOT'] || File.join(ENV['HOME'], '.gemsets')
-  INSTALL_ROOT = File.join('/', 'usr', 'local', 'share', 'auto_gemsets')
+  INSTALL_ROOT = File.join('/', 'usr', 'local', 'share', 'auto-gemsets')
   VERSION = File.read "#{ROOT}/VERSION"
   HELP = File.read "#{ROOT}/HELP.md"
 

data/lib/auto-gemsets/.auto-gemsets

@@ -0,0 +1 @@
+export AUTO_GEMSETS_REPORTING=on

data/lib/auto-gemsets/application.rb

@@ -117,22 +117,32 @@ module AutoGemsets
     end
 
     def init
-      if File.exists? "/usr/local/share/auto_gemsets/auto_gemsets.sh"
+      if File.exists? script_file
         @output.puts "auto-gemsets is already installed!"
         confirm("Do you wish overwrite this installation?", {
           accept: -> {
-            create_script
+            install_auto_gemsets
           },
           deny: -> {
             @output.puts "Existing installation preserved."
           }
         })
       else
-        create_script
+        install_auto_gemsets
       end
     end
 
     private
+      def install_auto_gemsets
+        create_script 'auto-gemsets.sh'
+        create_script 'default-gems.sh'
+        config_file = File.join(ENV['HOME'], '.auto-gemsets')
+        default_gemset_dir = File.join(AutoGemsets::GEMSET_ROOT, 'default')
+        FileUtils.cp(File.join(AutoGemsets::ROOT, 'lib', 'auto-gemsets', '.auto-gemsets'), config_file) unless File.exists? config_file
+        FileUtils.mkdir_p(AutoGemsets::GEMSET_ROOT) unless File.exists?(AutoGemsets::GEMSET_ROOT)
+        FileUtils.mkdir_p(default_gemset_dir) unless File.exists?(default_gemset_dir)
+      end
+
       def parse_options
         @options = {}
         OptionParser.new do |opts|
@@ -189,12 +199,16 @@ module AutoGemsets
       end
 
       def script_file
-        File.join(AutoGemsets::INSTALL_ROOT, "auto_gemsets.sh")
+        File.join(AutoGemsets::INSTALL_ROOT, "auto-gemsets.sh")
+      end
+
+      def default_gems_file
+        File.join(AutoGemsets::INSTALL_ROOT, "default-gems.sh")
       end
 
-      def create_script
+      def create_script(script)
         FileUtils.mkdir_p(AutoGemsets::INSTALL_ROOT) unless File.exists? AutoGemsets::INSTALL_ROOT
-        FileUtils.cp(File.join(AutoGemsets::ROOT, 'lib', 'auto-gemsets', 'auto_gemsets.sh'), AutoGemsets::INSTALL_ROOT)
+        FileUtils.cp(File.join(AutoGemsets::ROOT, 'lib', 'auto-gemsets', script), AutoGemsets::INSTALL_ROOT)
       end
   end
 

data/lib/auto-gemsets/auto-gemsets.sh

@@ -0,0 +1,120 @@
+ag_init() {
+  export GEMSET_ROOT="$HOME/.gemsets"
+
+  if [ -z "${DEFAULT_GEMSET}" ]; then
+    export DEFAULT_GEMSET="default"
+  fi
+
+  if [ -r "${HOME}/.auto-gemsets" ]; then
+    source "${HOME}/.auto-gemsets"
+  fi
+
+  # If ZSH add precommand
+  if [[ -n "$ZSH_VERSION" ]]; then
+    precmd_functions+=("auto_gemsets")
+  else
+    # If there's already a prompt command,
+    if [ -n "$PROMPT_COMMAND" ]; then
+      # check if it's already in the PROMPT
+      if [ -z "$(echo $PROMPT_COMMAND | grep auto_gemsets)" ] ; then
+        PROMPT_COMMAND="$PROMPT_COMMAND; auto_gemsets"
+      fi
+    else
+      PROMPT_COMMAND="auto_gemsets"
+    fi
+  fi
+
+  auto_gemsets
+}
+
+ag_set_gemset() {
+  if [ "$GEMSET" == "$1" ]; then
+    return;
+  fi
+  export GEMSET="${1}"
+  export GEM_HOME="${GEMSET_ROOT}/$GEMSET"
+  export GEM_ROOT="$GEM_HOME" # for chruby
+  export GEM_PATH="$GEM_HOME"
+  ag_add_path "${GEM_HOME}/bin"
+
+  if [ ! "$GEMSET" == 'default' ]; then
+    ag_add_path "${GEMSET_ROOT}/default/bin"
+    export GEM_PATH="${GEM_PATH}:${GEMSET_ROOT}/default"
+    ag_using_gemset_via "$GEMFILE"
+  else
+    ag_using_gemset_via "*default"
+  fi
+
+}
+
+ag_remove_path() {
+  CLEAN_PATH=""
+  IFS=':' read -a PATHS <<< "$PATH"
+  # Rip through paths and build a new path without the directory
+  for p in "${PATHS[@]}"
+  do
+    if [ ! "$p" == "$1" ]; then
+      # first time through, set CLEAN_PATH
+      if [ -z "$CLEAN_PATH" ]; then
+        CLEAN_PATH="$p"
+      else
+      # append the path
+        CLEAN_PATH="$CLEAN_PATH:$p"
+      fi
+    fi
+  done
+  export PATH="$CLEAN_PATH"
+}
+
+ag_using_gemset_via() {
+  if [ "$AUTO_GEMSETS_REPORTING" == "on" ]; then
+    echo "Now using $GEMSET gemset via $1"
+  fi
+}
+
+ag_add_path() {
+  if ! echo $PATH | egrep -q "(^|:)$1($|:)" ; then
+     export PATH="$1:$PATH"
+  fi
+}
+
+ag_parent_dir() {
+  if [ ! -z "$1" ]; then
+    IFS='/' read -a path_parts <<< "$1"
+    echo "${path_parts[${#path_parts[@]}-2]}"
+  else
+    echo ""
+  fi
+}
+
+auto_gemsets() {
+  local dir="$PWD"
+
+  until [[ -z "$dir" ]]; do
+    if [ "$GEMSET" ] && [ "$GEMSET" == "$(ag_parent_dir ${dir}/Gemfile)" ]; then
+      return;
+    fi
+
+    if [ -f "$dir/Gemfile" ]; then
+      export GEMFILE="$dir/Gemfile"
+      ag_create_gemset_if_missing "$(ag_parent_dir $GEMFILE)"
+      ag_set_gemset "$(ag_parent_dir $GEMFILE)"
+      return;
+    fi
+
+    if [ -z "${dir%/*}" ]; then
+      ag_set_gemset 'default'
+    fi
+
+    dir="${dir%/*}"
+  done
+}
+
+ag_create_gemset_if_missing() {
+  if [ ! -d "${GEMSET_ROOT}/${1}" ]; then
+    mkdir -p "${GEMSET_ROOT}/${1}" && echo "${1} gemset created. run gem install bundler"
+  fi
+}
+
+# Kick it
+ag_init

data/lib/auto-gemsets/default-gems.sh

@@ -0,0 +1,32 @@
+default-gems() {
+  if [ -z "$1" ]; then
+    cat <<EOF
+The defalt-gems command is an auto-gemsets utility to manage gems
+in the default* gemset from within other gemsets.
+
+Usage:
+------
+
+  default-gems (command) [options]
+
+Examples:
+---------
+
+  default-gems install mygem
+  default-gems uninstall mygem
+  default-gems list
+
+default-gems accepts any valid gem command, with any valid arguments and options.
+It is simply a pass-through to the gem command with the context of the default gemset.
+EOF
+  else
+    if [ ! "$GEMSET" == 'default' ]; then
+      G="$GEMSET"
+      ag_set_gemset 'default' > /dev/null
+      gem "$@"
+      ag_set_gemset "$G" > /dev/null
+    else
+      gem "$@"
+    fi
+  fi
+}

data/spec/application_spec.rb

@@ -130,23 +130,37 @@ describe AutoGemsets::Application do
   describe 'init' do
 
     before do
-      @script_file = File.join('/', 'usr', 'local', 'share', 'auto_gemsets', 'auto_gemsets.sh')
-      FileUtils.mv(@script_file, "#{@script_file}.bak") if File.exists?(@script_file)
+      @scripts = {
+        auto_gemsets: File.join('/', 'usr', 'local', 'share', 'auto-gemsets', 'auto-gemsets.sh'),
+        default_gems: File.join('/', 'usr', 'local', 'share', 'auto-gemsets', 'default-gems.sh'),
+        config: File.join(ENV['HOME'], '.auto-gemsets')
+      }
+      FileUtils.mv(@scripts[:auto_gemsets], "#{@scripts[:auto_gemsets]}.bak") if File.exists?(@scripts[:auto_gemsets])
+      FileUtils.mv(@scripts[:default_gems], "#{@scripts[:default_gems]}.bak") if File.exists?(@scripts[:default_gems])
+      FileUtils.mv(AutoGemsets::GEMSET_ROOT, "#{AutoGemsets::GEMSET_ROOT}.bak") if File.exists? AutoGemsets::GEMSET_ROOT
     end
 
     after do
-      FileUtils.rm_rf(@script_file) if File.exists?(@script_file)
-      FileUtils.mv("#{@script_file}.bak", @script_file) if File.exists?("#{@script_file}.bak")
+      FileUtils.rm_rf(@scripts[:auto_gemsets]) if File.exists?(@scripts[:auto_gemsets])
+      FileUtils.mv("#{@scripts[:auto_gemsets]}.bak", @scripts[:auto_gemsets]) if File.exists?("#{@scripts[:auto_gemsets]}.bak")
+
+      FileUtils.rm_rf(@scripts[:default_gems]) if File.exists?(@scripts[:default_gems])
+      FileUtils.mv("#{@scripts[:default_gems]}.bak", @scripts[:default_gems]) if File.exists?("#{@scripts[:default_gems]}.bak")
+
+      FileUtils.rm_rf(@scripts[:config]) if File.exists?(@scripts[:config])
+      FileUtils.mv("#{@scripts[:config]}.bak", @scripts[:config]) if File.exists?("#{@scripts[:config]}.bak")
+      FileUtils.rm_rf(AutoGemsets::GEMSET_ROOT) if File.exists? AutoGemsets::GEMSET_ROOT
+      FileUtils.mv("#{AutoGemsets::GEMSET_ROOT}.bak", AutoGemsets::GEMSET_ROOT) if File.exists? "#{AutoGemsets::GEMSET_ROOT}.bak"
     end
 
-    it "copies the auto_gemsets script in the share directory" do
+    it "copies the auto-gemsets script in the share directory" do
       @app.init
-      script_file = File.join(AutoGemsets::ROOT, 'lib', 'auto-gemsets', 'auto_gemsets.sh')
-      expect(File.read(@script_file)).to eq(File.read(script_file))
+      script_file = File.join(AutoGemsets::ROOT, 'lib', 'auto-gemsets', 'auto-gemsets.sh')
+      expect(File.read(@scripts[:auto_gemsets])).to eq(File.read(script_file))
     end
 
     it "warns if the script is already loaded and does nothing when y is not pressed" do
-      FileUtils.touch @script_file
+      FileUtils.touch @scripts[:auto_gemsets]
       @output.should_receive(:puts).once.with("auto-gemsets is already installed!")
       @output.should_receive(:puts).once.with("Do you wish overwrite this installation? y/n")
       @output.should_receive(:puts).once.with("Existing installation preserved.")
@@ -155,12 +169,34 @@ describe AutoGemsets::Application do
     end
 
     it "warns if the script is already loaded and overwrites it when y is pressed" do
-      FileUtils.touch @script_file
+      FileUtils.touch @scripts[:auto_gemsets]
       @output.should_receive(:puts).once.with("auto-gemsets is already installed!")
       @output.should_receive(:puts).once.with("Do you wish overwrite this installation? y/n")
       @input.stub!(:gets).and_return("y")
       @app.init
-      expect(File.read(@script_file)).to eq(File.read(File.join(AutoGemsets::INSTALL_ROOT, 'auto_gemsets.sh')))
+      expect(File.read(@scripts[:auto_gemsets])).to eq(File.read(File.join(AutoGemsets::INSTALL_ROOT, 'auto-gemsets.sh')))
+    end
+
+    it "copies the default-gems script in the share directory" do
+      @app.init
+      default_gems_file = File.join(AutoGemsets::ROOT, 'lib', 'auto-gemsets', 'default-gems.sh')
+      expect(File.read(@scripts[:default_gems])).to eq(File.read(default_gems_file))
+    end
+
+    it "creates a ~/.auto-gemsets file if one does not exist" do
+      @app.init
+      config_file = File.join(AutoGemsets::ROOT, 'lib', 'auto-gemsets', '.auto-gemsets')
+      expect(File.read(@scripts[:config])).to eq(File.read(config_file))
+    end
+
+    it "creates the GEMSET_ROOT directory" do
+      @app.init
+      expect(File.exists?(AutoGemsets::GEMSET_ROOT)).to be_true
+    end
+
+    it "creates the default gemset folder" do
+      @app.init
+      expect(File.exists?(File.join(AutoGemsets::GEMSET_ROOT, 'default'))).to be_true
     end
 
   end

data/spec/auto-gemsets_spec.rb

@@ -15,7 +15,7 @@ describe AutoGemsets do
   end
 
   it "has an INSTALL_ROOT" do
-    expect(AutoGemsets::INSTALL_ROOT).to eq('/usr/local/share/auto_gemsets')
+    expect(AutoGemsets::INSTALL_ROOT).to eq('/usr/local/share/auto-gemsets')
   end
 
   it "has a VERSION" do

data/test/ag_add_path_test.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+. ./test/helper.sh
+
+setUp() {
+  clear_env
+  export PATH="test:/usr/bin:/bin"
+}
+
+tearDown() {
+  reset_env
+}
+
+test_it_does_not_duplicate_entries() {
+  ag_add_path 'test'
+  assertEquals " it doesn't duplicate entries" \
+    "test:/usr/bin:/bin" "$PATH"
+}
+
+SHUNIT_PARENT=$0 . $SHUNIT2

data/test/ag_init_test.sh

@@ -0,0 +1,81 @@
+#!/bin/sh
+
+. ./test/helper.sh
+
+setUp() {
+  clear_env
+  if [ ! -f "${HOME}/.auto-gemsets" ]; then
+    touch "${HOME}/.auto-gemsets"; echo "export AUTO_GEMSETS_REPORTING=on" > "${HOME}/.auto-gemsets"
+  fi
+}
+
+tearDown() {
+  reset_env
+}
+
+test_it_adds_a_gemset_root_environment_variable() {
+  ag_init > /dev/null
+  assertEquals " it adds a GEMSET_ROOT environment variable" \
+    "$HOME/.gemsets" "$GEMSET_ROOT"
+}
+
+test_sets_default_gemset_if_not_defined() {
+  ag_init > /dev/null
+  assertEquals " it sets the DEFAULT_GEMSET" \
+    "default" "$DEFAULT_GEMSET"
+}
+
+test_ignores_default_gemset_if_defined() {
+  export DEFAULT_GEMSET='test'
+  ag_init > /dev/null
+  assertEquals " it sets the DEFAULT_GEMSET" \
+    "test" "$DEFAULT_GEMSET"
+}
+
+test_it_adds_auto_gemsets_to_the_prompt_command() {
+  ag_init > /dev/null
+  assertEquals " it adds auto_gemsets to the PROMPT_COMMAND" \
+    "$PROMPT_COMMAND" "auto_gemsets"
+}
+
+test_it_appends_to_the_prompt_command_if_it_already_has_functions() {
+  export PROMPT_COMMAND=":"
+  ag_init > /dev/null
+  assertEquals " it appends to the PROMPT_COMMAND if it already has functions" \
+    ":; auto_gemsets" "$PROMPT_COMMAND"
+}
+
+test_it_doesnt_duplicate_the_prompt_command() {
+  export PROMPT_COMMAND="auto_gemsets"
+  ag_init > /dev/null
+  assertEquals " it doesn't duplicate the PROMPT_COMMAND" \
+    "auto_gemsets" "$PROMPT_COMMAND"
+}
+
+test_it_sources_the_auto_gemsets_file() {
+  ag_init > /dev/null
+  assertEquals " it sources the ~/.auto-gemsets file" \
+    "on" "$AUTO_GEMSETS_REPORTING"
+}
+
+test_it_calls_auto_gemsets() {
+  cd "$HOME"
+  ag_init > /dev/null
+
+  assertEquals " it sets the default when no Gemfile is present" \
+    "default" "$GEMSET"
+
+  assertEquals " it sets the GEM_HOME when no Gemfile is present" \
+    "${GEMSET_ROOT}/default" "$GEM_HOME"
+
+  assertEquals " it sets the GEM_HOME when no Gemfile is present" \
+    "${GEMSET_ROOT}/default" "$GEM_ROOT"
+
+  assertEquals " it sets the GEM_PATH when no Gemfile is present" \
+    "${GEMSET_ROOT}/default" "$GEM_PATH"
+
+  assertNotNull " it adds the gemset's bin directory to the path" \
+    "$(echo $PATH | grep "${GEMSET_ROOT}/default/bin")"
+}
+
+SHUNIT_PARENT=$0 . $SHUNIT2

data/test/ag_parent_dir_test.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. ./test/helper.sh
+
+setUp() {
+  clear_env
+}
+
+tearDown() {
+  reset_env
+}
+
+test_it_finds_the_parent_directory_name() {
+  assertEquals "it finds the parent directory name" \
+    "auto-gemsets" "$(ag_parent_dir ${PWD}/Gemfile)"
+}
+
+SHUNIT_PARENT=$0 . $SHUNIT2

data/test/ag_remove_path_test.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+. ./test/helper.sh
+
+setUp() {
+  clear_env
+}
+
+tearDown() {
+  reset_env
+}
+
+test_it_removes_a_directory_from_the_path() {
+  ag_remove_path '/ag/test/path'
+  assertNull " it removes a path from the path" \
+    "$(echo $PATH | grep "/ag/test/path")"
+}
+
+SHUNIT_PARENT=$0 . $SHUNIT2

data/test/ag_set_gemset_test.sh

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+. ./test/helper.sh
+
+setUp() {
+  clear_env
+  export AUTO_GEMSETS_REPORTING='off'
+}
+
+tearDown() {
+  reset_env
+}
+
+test_it_sets_gem_home_to_the_gemset_path() {
+  ag_set_gemset 'default'
+  assertEquals " it sets the GEM_HOME to the default gemset path" \
+    "${GEMSET_ROOT}/default" "$GEM_HOME"
+}
+
+test_it_sets_gem_path_to_the_default_gemset_path() {
+  ag_set_gemset 'default'
+  assertEquals " it sets the GEM_PATH to the default gemset path" \
+    "${GEMSET_ROOT}/default" "$GEM_PATH"
+}
+
+test_it_adds_the_gemset_bin_directory_to_the_path() {
+  ag_set_gemset 'default'
+  assertNotNull " it adds the gemset's bin directory to the path" \
+    "$(echo $PATH | grep "${GEM_HOME}/bin")"
+}
+
+test_it_adds_the_default_bin_directory_to_path_when_not_default() {
+  ag_set_gemset 'some_gemset'
+  assertNotNull " it adds the default gemset's bin directory to the path" \
+    "$(echo $PATH | grep "${GEMSET_ROOT}/default/bin")"
+}
+
+test_it_adds_the_default_gemset_to_the_gem_path() {
+  ag_set_gemset 'some_gemset'
+
+  assertEquals " it adds the default gemset to the GEM_PATH" \
+    "${GEMSET_ROOT}/some_gemset:${GEMSET_ROOT}/default" "$GEM_PATH"
+}
+
+test_it_sets_the_gemset_environment_variable() {
+  ag_set_gemset 'default'
+  assertEquals " it sets the GEMSET environment variable" \
+    "default" "$GEMSET"
+}
+
+test_it_sets_the_gem_root_variable() {
+  ag_set_gemset 'default'
+  assertEquals " it sets the GEM_ROOT environment variable" \
+    "${GEMSET_ROOT}/default" "$GEM_ROOT"
+}
+
+test_it_reports_the_new_gemset_change() {
+  export AUTO_GEMSETS_REPORTING='on'
+  assertEquals " it reports the new gemset change *default when default" \
+    "Now using default gemset via *default" "$(ag_set_gemset 'default')"
+
+  export GEMFILE="test"
+  assertEquals " it reports the new gemset change with the GEMFILE when NOT default" \
+    "Now using some_gemset gemset via test" "$(ag_set_gemset 'some_gemset')"
+}
+
+SHUNIT_PARENT=$0 . $SHUNIT2

data/test/auto_gemsets_test.sh

@@ -0,0 +1,83 @@
+#!/bin/sh
+
+. ./test/helper.sh
+
+PROJECT_DIR="$PWD/test/project"
+
+setUp() {
+  clear_env
+  if [ ! -d "${GEMSET_ROOT}/project" ]; then
+    rm -Rf "${GEMSET_ROOT}/project"
+  fi
+}
+
+tearDown() {
+  reset_env
+  if [ ! -d "${GEMSET_ROOT}/project" ]; then
+    rm -Rf "${GEMSET_ROOT}/project"
+  fi
+}
+
+test_it_sets_the_gemfile_environment_variable() {
+  cd "$PROJECT_DIR"
+  auto_gemsets
+
+  assertEquals " it sets the gemfile environment variable" \
+    "${PROJECT_DIR}/Gemfile" "$GEMFILE"
+}
+
+test_it_sets_the_default_gemset_when_no_gemfile_is_present() {
+  cd "$HOME"
+  auto_gemsets
+
+  assertEquals " it sets the default when no Gemfile is present" \
+    "default" "$GEMSET"
+
+  assertEquals " it sets the GEM_HOME when no Gemfile is present" \
+    "${GEMSET_ROOT}/default" "$GEM_HOME"
+
+  assertEquals " it sets the GEM_HOME when no Gemfile is present" \
+    "${GEMSET_ROOT}/default" "$GEM_ROOT"
+
+  assertEquals " it sets the GEM_PATH when no Gemfile is present" \
+    "${GEMSET_ROOT}/default" "$GEM_PATH"
+
+  assertNotNull " it adds the gemset's bin directory to the path" \
+    "$(echo $PATH | grep "${GEMSET_ROOT}/default/bin")"
+}
+
+test_it_sets_the_gemset_when_a_gemfile_is_present() {
+  cd "$PROJECT_DIR"
+  auto_gemsets
+
+  assertEquals " it sets the gemset when a Gemfile is present" \
+    "project" "$GEMSET"
+
+  assertEquals " it sets the GEM_HOME when no Gemfile is present" \
+    "${GEMSET_ROOT}/project" "$GEM_HOME"
+
+  assertEquals " it sets the GEM_HOME when no Gemfile is present" \
+    "${GEMSET_ROOT}/project" "$GEM_ROOT"
+
+  assertEquals " it sets the GEM_PATH when no Gemfile is present" \
+    "${GEMSET_ROOT}/project:${GEMSET_ROOT}/default" "$GEM_PATH"
+
+  assertNotNull " it adds the gemset's bin directory to the path" \
+    "$(echo $PATH | grep "${GEMSET_ROOT}/default/bin")"
+}
+
+test_it_doesnt_do_anything_if_the_gemset_is_active() {
+  export GEMSET="project"
+
+  assertNull " it doesnt do anything if the gemset is active" \
+    "$(auto_gemsets)"
+}
+
+test_it_creates_a_gemset_directory_if_it_does_not_exist() {
+  auto_gemsets
+
+  assertTrue " it creates a gemset directory if it does not exist" \
+    "[ -d ${GEMSET_ROOT}/project ]"
+}
+
+SHUNIT_PARENT=$0 . $SHUNIT2

data/test/helper.sh

@@ -0,0 +1,59 @@
+#!/bin/sh
+
+OLD_GEM_HOME=$GEM_HOME
+OLD_GEM_PATH=$GEM_PATH
+OLD_GEM_ROOT=$GEM_ROOT
+OLD_GEMSET=$GEMSET
+OLD_DEFAULT_GEMSET=$DEFAULT_GEMSET
+OLD_GEMFILE=$GEMFILE
+OLD_PATH=$PATH
+OLD_PROMPT_COMMAND=$PROMPT_COMMAND
+OLD_AUTO_GEMSETS_REPORTING=$AUTO_GEMSETS_REPORTING
+
+clear_env() {
+  unset GEM_HOME
+  unset GEM_PATH
+  unset GEM_ROOT
+  unset GEMSET
+  unset DEFAULT_GEMSET
+  unset GEMFILE
+  unset PROMPT_COMMAND
+  unset AUTO_GEMSETS_REPORTING
+  mv "/usr/local/share/auto-gemsets" "/usr/local/share/auto-gemsets.bak"
+
+  if [ -f "${HOME}/.auto-gemsets" ]; then
+    mv "${HOME}/.auto-gemsets" "${HOME}/.auto-gemsets.bak"
+  fi
+}
+
+reset_env() {
+  rm -Rf "/usr/local/share/auto-gemsets"
+  mv "/usr/local/share/auto-gemsets.bak" "/usr/local/share/auto-gemsets"
+  if [ -f "${HOME}/.auto-gemsets.bak" ]; then
+    mv "${HOME}/.auto-gemsets.bak" "${HOME}/.auto-gemsets"
+  fi
+  export GEM_HOME=$OLD_GEM_HOME
+  export GEM_PATH=$OLD_GEM_PATH
+  export GEM_ROOT=$OLD_GEM_ROOT
+  export GEMSET=$OLD_GEMSET
+  export DEFAULT_GEMSET=$OLD_DEFAULT_GEMSET
+  export GEMFILE=$OLD_GEMFILE
+  export PATH=$OLD_PATH
+  export PROMPT_COMMAND=$OLD_PROMPT_COMMAND
+  export AUTO_GEMSETS_REPORTING=$OLD_AUTO_GEMSETS_REPORTING
+}
+
+[[ -z "$SHUNIT2" ]] && SHUNIT2=/usr/share/shunit2/shunit2
+
+. ./lib/auto-gemsets/auto-gemsets.sh
+
+setUp() { return; }
+tearDown() { return; }
+oneTimeTearDown() {
+  if [ "$__shunit_assertsFailed" -gt "0" ]; then
+    echo
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+    echo "!!------------------------------------------------ FAILURE ------------------------------------------------!!"
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+  fi
+}

data/test/runner

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+log() {
+  echo
+  echo "$1"
+  echo
+}
+
+for test in $(dirname $0)/*_test.sh; do
+  log ">>> Running $test"
+  $SHELL $test
+  echo '------------------------------------------------------------'
+done

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto-gemsets
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -129,11 +129,22 @@ files:
 - auto-gemsets.gemspec
 - bin/gemset
 - lib/auto-gemsets.rb
+- lib/auto-gemsets/.auto-gemsets
 - lib/auto-gemsets/application.rb
-- lib/auto-gemsets/auto_gemsets.sh
+- lib/auto-gemsets/auto-gemsets.sh
+- lib/auto-gemsets/default-gems.sh
 - spec/application_spec.rb
 - spec/auto-gemsets_spec.rb
 - spec/spec_helper.rb
+- test/ag_add_path_test.sh
+- test/ag_init_test.sh
+- test/ag_parent_dir_test.sh
+- test/ag_remove_path_test.sh
+- test/ag_set_gemset_test.sh
+- test/auto_gemsets_test.sh
+- test/helper.sh
+- test/project/Gemfile
+- test/runner
 - travis.yml
 homepage: http://github.com/daytonn/auto-gemsets
 licenses:
@@ -150,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -962648630984490021
+      hash: 3197001320140692747
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/auto-gemsets/auto_gemsets.sh

@@ -1,174 +0,0 @@
-SILENT="off"
-
-ag_silent() {
-  if [ -n "$1" ] && [ "$1" == "on" ]; then
-    SILENT="on"
-  else
-    SILENT="off"
-  fi
-
-}
-
-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() {
-  if [ "$SILENT" == "off" ]; then
-    echo "Now using $GEMSET gemset via $1"
-  fi
-}
-
-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
-}
-
-auto_gemsets() {
-  local dir="$PWD"
-
-  until [[ -z "$dir" ]]; do
-    GEMFILE="$dir/Gemfile"
-    ag_get_parent_dirname
-
-    if [ "$GEMSET" == "$PARENT_DIR" ]; then
-      break
-    fi
-
-    if [ -f "$GEMFILE" ]; then
-      ag_set_gemset "$PARENT_DIR"
-      break
-    fi
-
-    if [ -z "${dir%/*}" ] && [ ! "$GEMSET" == $( basename $DEFAULT_GEMSET ) ]; then
-      ag_set_default_gemset
-      break
-    fi
-
-    dir="${dir%/*}"
-  done
-}
-
-ag_get_parent_dirname() {
-  if [ ! -z "$GEMFILE" ]; then
-    IFS='/' read -a gemfile_path_parts <<< "$GEMFILE"
-    PARENT_DIR="${gemfile_path_parts[${#gemfile_path_parts[@]}-2]}"
-  fi
-}
-
-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"
-
-  ag_add_path "$DEFAULT_BIN_PATH"
-  ag_add_path "$NEW_GEMSET_BIN_PATH"
-
-  ag_using_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
-}
-
-default-gems() {
-  if [ -n "$1" ]; then
-    ag_silent "on"
-    G="$GEMSET"
-    ag_set_default_gemset
-    gem "$@"
-    ag_set_gemset "$G"
-    ag_silent "off"
-  else
-    cat <<EOF
-The defalt-gems command is an auto-gems utility to manage gems
-in the default* gemset from within other gemsets.
-
-Usage:
-------
-
-  default-gems (command) [options]
-
-Examples:
----------
-
-  default-gems install mygem
-  default-gems uninstall mygem
-  default-gems list
-
-`default-gems` accepts any valid `gem` command, with any valid arguments and options.
-It is simply a pass-through to the `gem` command with the context of the default gemset.
-EOF
-
-  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 there's already a prompt command,
-  if [ -n "$PROMPT_COMMAND" ]; then
-    # check if it's already in the PROMPT
-    if [ -z "$(echo $PROMPT_COMMAND | grep auto_gemsets)" ] ; then
-      PROMPT_COMMAND="$PROMPT_COMMAND; auto_gemsets"
-    fi
-  else
-    PROMPT_COMMAND="auto_gemsets"
-  fi
-fi