auto-gemsets 0.2.0 → 0.2.1

data/HELP.md

@@ -20,6 +20,10 @@ Examples:
 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.
+
 ls, list
 --------
     gemset ls

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/auto-gemsets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "auto-gemsets"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
-  s.date = "2012-12-23"
+  s.date = "2013-01-01"
   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"]
@@ -33,7 +33,8 @@ Gem::Specification.new do |s|
     "lib/auto-gemsets/auto_gemsets.sh",
     "spec/application_spec.rb",
     "spec/auto-gemsets_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "travis.yml"
   ]
   s.homepage = "http://github.com/daytonn/auto-gemsets"
   s.licenses = ["Apache 2.0"]

data/lib/auto-gemsets/application.rb

@@ -21,8 +21,7 @@ module AutoGemsets
       @output = output
       @input = input
       @args = args
-      @command = @args.shift.to_sym unless @args.empty? || @args.first =~ /^-/
-
+      @command = @args.empty? ? :current : @args.shift.to_sym unless @args.first =~ /^-/
       parse_options
     end
 
@@ -33,33 +32,11 @@ module AutoGemsets
     end
 
     def run
-      if @command
-        self.send @command, *@args
-      else
-        if options[:help]
-          help
-        elsif options[:version]
-          version
-        else
-          self.send(:current)
-        end
-      end
+      self.send @command, *@args
     end
 
     def ls
-      gemsets = Dir.glob(File.join(ENV['HOME'], '.gemsets', '*')).map do |d|
-        gemset = File.basename(d)
-        case gemset
-        when default_gemset
-          gemset = "   #{gemset}*"
-        when ENV['GEMSET']
-          gemset = "-> #{gemset}"
-        else
-          gemset = "   #{gemset}"
-        end
-        gemset
-      end
-
+      gemsets = Dir.glob(File.join(ENV['HOME'], '.gemsets', '*')).map { |d| display_gemset d }
       @output.puts gemsets.join "\n"
     end
 
@@ -78,23 +55,20 @@ module AutoGemsets
     end
 
     def mv(gemset, new_gemset)
-      if !File.exists?(gemset_path(new_gemset))
-        if FileUtils.mv(gemset_path(gemset), gemset_path(new_gemset))
-          @output.puts "#{gemset} renamed to #{new_gemset}"
-        end
+      if !File.exists?(gemset_path(new_gemset)) && FileUtils.mv(gemset_path(gemset), gemset_path(new_gemset))
+        @output.puts "#{gemset} renamed to #{new_gemset}"
       else
         @output.puts "#{new_gemset} already exists!"
-        @output.puts "Do you really wish to replace #{new_gemset} with #{gemset}? y/n"
-
-        confirmation = @input.gets
-        if confirmation =~ /^y/i
-          FileUtils.rm_rf(gemset_path(new_gemset))
-          if FileUtils.mv(gemset_path(gemset), gemset_path(new_gemset))
-            @output.puts "#{gemset} renamed to #{new_gemset}"
-          end
-        else
-          @output.puts "No gemsets were harmed."
-        end
+        confirm("Do you really wish to replace #{new_gemset} with #{gemset}?", {
+          accept: -> {
+            if FileUtils.rm_rf(gemset_path(new_gemset)) && FileUtils.mv(gemset_path(gemset), gemset_path(new_gemset))
+              @output.puts "#{gemset} renamed to #{new_gemset}"
+            end
+          },
+          deny: -> {
+            @output.puts "No gemsets were harmed."
+          }
+        })
       end
     end
 
@@ -103,34 +77,37 @@ module AutoGemsets
     end
 
     def rm(gemset)
-      @output.puts "Are you sure you wish to delete the #{gemset} gemset? y/n"
-      confirmation = @input.gets
-      if confirmation =~ /^y/i
-        if File.exists?(gemset_path(gemset)) && FileUtils.rm_rf(gemset_path(gemset))
-          @output.puts "#{gemset} gemset removed!"
-        end
-      else
-        @output.puts "No gemsets were harmed."
-      end
+      confirm("Are you sure you wish to delete the #{gemset} gemset?", {
+        accept: -> {
+          if File.exists?(gemset_path(gemset)) && FileUtils.rm_rf(gemset_path(gemset))
+            @output.puts "#{gemset} gemset removed!"
+          end
+        },
+        deny: -> {
+          @output.puts "No gemsets were harmed."
+        }
+      })
     end
 
     def remove(gemset)
       rm(gemset)
     end
 
-    def open(gemset=nil)
-      if AutoGemsets::on_OSX?
-        if gemset
-          if File.exists?(gemset_path(gemset))
-            %x{open #{gemset_path(gemset)}}
-          else
-            @output.puts "No gemset named #{gemset}!"
-          end
-        else
-          %x{open #{AutoGemsets::GEMSET_ROOT}}
-        end
+    def open(gemset = nil)
+      command = case
+      when AutoGemsets::on_OSX?
+        'open'
+      when AutoGemsets::on_linux?
+        'xdg-open'
+      when AutoGemsets::on_windows?
+        'explorer'
+      end
+
+      if gemset
+        %x{#{command} #{gemset_path(gemset)}} if File.exists?(gemset_path(gemset))
+        @output.puts "No gemset named #{gemset}!" unless File.exists?(gemset_path(gemset))
       else
-        @output.puts "currently this command is only available for OS X users"
+        %x{#{command} #{AutoGemsets::GEMSET_ROOT}}
       end
     end
 
@@ -140,20 +117,19 @@ module AutoGemsets
     end
 
     def init
-      FileUtils.mkdir_p(AutoGemsets::INSTALL_ROOT) unless File.exists? AutoGemsets::INSTALL_ROOT
-      script_file = File.join(AutoGemsets::ROOT, 'lib', 'auto-gemsets', 'auto_gemsets.sh')
       if File.exists? script_file
         @output.puts "auto-gemsets is already installed!"
-        @output.puts "Do you wish overwrite this installation? y/n"
-        confirmation = @input.gets
-        if confirmation =~ /^y/i
-
-        else
-          @output.puts "Existing installation preserved."
-        end
+        confirm("Do you wish overwrite this installation?", {
+          accept: -> {
+            create_script
+          },
+          deny: -> {
+            @output.puts "Existing installation preserved."
+          }
+        })
+      else
+        create_script
       end
-      FileUtils.cp(script_file, AutoGemsets::INSTALL_ROOT)
-      FileUtils.chmod("a+x", "#{AutoGemsets::INSTALL_ROOT}/auto_gemsets.sh")
     end
 
     private
@@ -162,10 +138,12 @@ module AutoGemsets
         OptionParser.new do |opts|
           opts.on("-v", "--version", "Version info") do
             @options[:version] = true
+            @command = :version
           end
 
           opts.on('-h', '--help', 'Display help') do
             @options[:help] = true
+            @command = :help
           end
         end.parse!
 
@@ -187,6 +165,38 @@ module AutoGemsets
       def default_gemset
         File.basename(ENV['DEFAULT_GEMSET'])
       end
+
+      def display_gemset(gemset_dir)
+        case gemset = File.basename(gemset_dir)
+        when default_gemset
+          gemset = "   #{gemset}*"
+        when ENV['GEMSET']
+          gemset = "-> #{gemset}"
+        else
+          gemset = "   #{gemset}"
+        end
+        gemset
+      end
+
+      def confirm(question, callbacks = {})
+        settings = {
+          accept: -> { nil },
+          deny: -> { nil }
+        }.merge! callbacks
+
+        @output.puts "#{question} y/n"
+        @input.gets =~ /^y/i ? settings[:accept].call : settings[:deny].call
+      end
+
+      def script_file
+        File.join(AutoGemsets::INSTALL_ROOT, "auto_gemsets.sh")
+      end
+
+      def create_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.chmod("a+x", File.join(AutoGemsets::INSTALL_ROOT, File.basename(script_file)))
+      end
   end
 
 end

data/lib/auto-gemsets/auto_gemsets.sh

@@ -71,28 +71,32 @@ auto_gemsets() {
 
   until [[ -z "$dir" ]]; do
     GEMFILE="$dir/Gemfile"
+    ag_get_parent_dirname
+
+    if [ "$GEMSET" == "$PARENT_DIR" ]; then
+      break
+    fi
 
     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
+      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() {
-  IFS='/' read -a gemfile_path_parts <<< "$GEMFILE"
-  PARENT_DIR="${gemfile_path_parts[${#gemfile_path_parts[@]}-2]}"
+  if [ ! -z "$GEMFILE" ]; then
+    IFS='/' read -a gemfile_path_parts <<< "$GEMFILE"
+    PARENT_DIR="${gemfile_path_parts[${#gemfile_path_parts[@]}-2]}"
+  fi
 }
 
 ag_set_gemset() {
@@ -162,15 +166,10 @@ else
   # 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
+    if [ -z "$(echo $PROMPT_COMMAND | grep auto_gemsets)" ] ; then
       PROMPT_COMMAND="$PROMPT_COMMAND; auto_gemsets"
     fi
   else
     PROMPT_COMMAND="auto_gemsets"
   fi
-fi
-
-# Set default when sourced
-ag_silent "on"
-ag_set_default_gemset
-ag_silent "off"
+fi

data/spec/application_spec.rb

@@ -10,22 +10,19 @@ describe AutoGemsets::Application do
     @gemset = SecureRandom::hex
     @random_gemset = File.join(ENV['HOME'], '.gemsets', @gemset)
     FileUtils.mkdir_p(@random_gemset)
+    @env_gemset = ENV['GEMSET']
+    @env_default_gemset = ENV['DEFAULT_GEMSET']
+    ENV['DEFAULT_GEMSET'] = 'mygemset'
+    ENV['GEMSET'] = @gemset
   end
 
   after do
     FileUtils.rm_rf(@random_gemset) if File.exists? @random_gemset
+    ENV['GEMSET'] = @env_gemset
+    ENV['DEFAULT_GEMSET'] = @env_default_gemset
   end
 
   describe 'current' do
-    before do
-      @env_gemset = ENV['GEMSET']
-      ENV['GEMSET'] = @gemset
-    end
-
-    after do
-      ENV['GEMSET'] = @env_gemset
-    end
-
     it "shows the current gemset" do
       @output.should_receive(:puts).with("-> #{@gemset}")
       @app.current

data/travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto-gemsets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2013-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -134,6 +134,7 @@ files:
 - spec/application_spec.rb
 - spec/auto-gemsets_spec.rb
 - spec/spec_helper.rb
+- travis.yml
 homepage: http://github.com/daytonn/auto-gemsets
 licenses:
 - Apache 2.0
@@ -149,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3895543352290661910
+      hash: 4587648895543290072
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: