auto-gemsets 0.1.3 → 0.1.4

data/HELP

@@ -1,17 +1,41 @@
-When gemset is called without a sub command, it will display the current gemset.
-  The gemset command also has various sub-commands that help you manage your gemset library
+gemset [command]
 
-Usage: gemset [command]
+  When the gemset command is called with no arguments,
+  it simply displays the current gemset in use.
+  Note that the GEM environment includes both
+  the current and default gemset's gems.
 
-gemset - display current gemset
+Commands
+========
 
-commands:
+  ls, list
+    List all gemsets in your GEMSET_ROOT.
+    The gemset with the -> at the begining is the current gemset.
+    The gemset with the * at the end is the default gemset.
+    Note that the GEM environment includes both the current and default gemset's gems.
 
-list - list all gemsets in your GEMSET_ROOT
+  rm, remove
+    gemset rm (gemset)
+    gemset remove (gemset)
 
-  gemset list
+    Removes the given gemset from the GEMSET_ROOT.
+    To prevent unwanted deletions, a confirmation dialog will ask if you wish to continue.
 
-rm - completely remove a gemset from your GEMSET_ROOT
+  touch, create
+    gemset touch (gemset)
+    gemset create (gemset)
 
-  gemset rm my-gemset
+    Create a new gemset in the GESET_ROOT with the given name
 
+  mv, rename
+    gemset mv (gemset) (name)
+    gemset rename (gemset) (name)
+
+    Renames the given gemset with the given name within the GESET_ROOT.
+    If the new gemset name conflicts with an existing gemset,
+    a confirmation dialog will ask if you wish to continue
+
+  edit
+    gemset edit (gemset)
+
+    Opens the gemset's Gemfile in your default EDITOR or TERM_EDITOR

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/auto-gemsets.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "auto-gemsets"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]

data/auto_gemsets.sh

@@ -20,7 +20,7 @@ function auto_gemsets() {
       export GEM_PATH="${GEM_HOME}:${DEFAULT_GEMSET}"
       export GEMSET="${gemset}"
       export GEMFILE="${gemfile}"
-      create_gemset_if_missing && echo "Now using ${GEMSET} gemset via ${GEMFILE}"
+      create_gemset_if_missing && list_gemset
       break
     elif [[ ! -f "$gemfile" ]]; then
       set_default_gemset
@@ -36,11 +36,19 @@ function set_default_gemset() {
       export GEM_HOME="${DEFAULT_GEMSET}"
       export GEM_ROOT="${DEFAULT_GEMSET}"
       export GEM_PATH="${DEFAULT_GEMSET}"
-      echo "Now using default gemset $(basename $DEFAULT_GEMSET) via ${DEFAULT_GEMSET}"
+      export GEMSET="daytonn*"
+      export GEMFILE="*default"
+      if [ -z "$GEMSET_PRELOAD" ]; then
+        list_gemset
+      fi
     fi
   fi
 }
 
+function list_gemset() {
+  echo "Now using ${GEMSET} gemset via ${GEMFILE}"
+}
+
 if [ ! -n "$GEMSET_ROOT" ]; then
   export GEMSET_ROOT="${HOME}/.gemsets"
 fi
@@ -57,5 +65,11 @@ else
   fi
 fi
 
-# Set default on load
-set_default_gemset
+function init() {
+  # Set default on load
+  GEMSET_PRELOAD="true"
+  set_default_gemset
+  unset GEMSET_PRELOAD
+}
+
+init

data/lib/auto-gemsets/application.rb

@@ -21,20 +21,20 @@ module AutoGemsets
       @output = output
       @input = input
       @args = args
-      @command = @args.empty? ? :current : @args.shift.to_sym
+      @command = @args.shift.to_sym unless @args.empty? || @args.first =~ /^-/
 
       parse_options
     end
 
     def current
-      @output.puts ENV['GEMSET']
+      @output.puts "-> #{ENV['GEMSET']}"
     end
 
     def run
       if @command
-        self.send @command, *@args unless @command =~ /^-/
+        self.send @command, *@args
       else
-        help
+        options[:help] ? help : self.send(:current)
       end
     end
 
@@ -42,9 +42,10 @@ module AutoGemsets
       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
+        case gemset
+        when default_gemset
           gemset = "   #{gemset}*"
-        elsif gemset == ENV['GEMSET']
+        when ENV['GEMSET']
           gemset = "-> #{gemset}"
         else
           gemset = "   #{gemset}"
@@ -128,7 +129,7 @@ module AutoGemsets
 
     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']}}
+      %x{#{ENV['EDITOR'] || ENV['TERM_EDITOR']} #{ENV['GEMFILE']}} if File.exists ENV['GEMFILE']
     end
 
     private
@@ -142,20 +143,21 @@ module AutoGemsets
 
           opts.on('-h', '--help', 'Display help') do
             @options[:help] = true
-            help
           end
         end.parse!
+
+        @args.reject! { |a| a =~ /^-/ }
       end
 
       def help
-        puts AutoGemsets::HELP
+        @output.puts AutoGemsets::HELP
       end
 
       def version
         version = File.read("#{AutoGemsets::base_directory}/VERSION")
         message = "auto-gemsets #{version}\n"
         message << "Copyright (c) #{Time.now.year} Dayton Nolan\n"
-        puts message
+        @output.puts message
       end
 
       def gemset_path(gemset)

data/spec/application_spec.rb

@@ -27,12 +27,12 @@ describe AutoGemsets::Application do
     end
 
     it "shows the current gemset" do
-      @output.should_receive(:puts).with(@gemset)
+      @output.should_receive(:puts).with("-> #{@gemset}")
       @app.current
     end
 
     it "shows the current gemset when called with no arguments" do
-      @output.should_receive(:puts).with(@gemset)
+      @output.should_receive(:puts).with("-> #{@gemset}")
       app = AutoGemsets::Application.new(@output, @input, [])
       app.run
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto-gemsets
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1199271286418570483
+      hash: 4117892607969008592
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: