ruby-llenv 0.0.3 → 0.0.4

data/Changelog.md

@@ -1,3 +1,10 @@
+## 0.0.4 (2012-11-25)
+
+* Refactoring
+    * Divide declaring repository
+* Omit command line options
+    * use ENV
+
 ## 0.0.3 (2012-11-25)
 
 * Dir.exists? -> File.directory? for ruby 1.8.7

data/README.md

@@ -18,16 +18,27 @@ Or install it yourself as:
 
 ## Usage
 
+Install ruby-1.9.3-p327 to ~/.llenv/ruby-1.9.3-p327/, and also `bundle install` required modules to your-project/vendor/bundle. See [install.sh](https://github.com/riywo/llenv-declare/blob/master/ruby-1.9.3-p327/install.sh).
+
     $ cd your-project
     $ echo ruby-1.9.3-p327 > .llenv
     $ llenv install
 
-Install ruby-1.9.3-p327 to ~/.llenv/ruby-1.9.3-p327/, and also `bundle install` required modules to your-project/vendor/bundle. See [install.sh](https://github.com/riywo/ruby-llenv/blob/master/declare/ruby-1.9.3-p327/install.sh).
+Execute any command. See [exec.sh](https://github.com/riywo/llenv-declare/blob/master/ruby-1.9.3-p327/exec.sh).
 
     $ cd your-project
+    $ llenv exec ruby -v
     $ llenv exec rackup
 
-See [exec.sh](https://github.com/riywo/ruby-llenv/blob/master/declare/ruby-1.9.3-p327/exec.sh).
+## ENV
+
+### `LLENV_ROOT`
+
+Root directory installed all LLs. Default: "~/.llenv"
+
+### `LLENV_DECLARE_URL`
+
+Declare repository URL. Default: [https://github.com/riywo/llenv-declare.git](https://github.com/riywo/llenv-declare.git)
 
 ## Contributing
 

data/lib/llenv/cli.rb

@@ -4,27 +4,32 @@ require "thor"
 
 class LLenv::CLI < Thor
 
-  class_option :declare, :type => :string, :aliases => "-d", :desc => "Specify a user declare directory"
-  class_option :home,    :type => :string, :aliases => "-h", :desc => "Specify a home directory of LL (Default: ~/.llenv)"
+  def initialize(args = [], options = {}, config = {})
+    @root_dir     = ENV["LLENV_ROOT"] || File.expand_path("~/.llenv")
+    @declare_repo = ENV["LLENV_DECLARE_URL"] || "https://github.com/riywo/llenv-declare.git"
+    @declare      = LLenv::Declare.new(@root_dir)
+    super
+  end
+
+  desc "list", "List of declaring"
+  def list
+    check_root_dir!
+    @declare.list
+  end
 
   desc "install", "Install declared LL"
   def install
-    load_llenv_file!
-    check_homedir!
-    load_declare!
-    @declare.install
+    check_root_dir!
+    @declare.install(llenv)
   end
 
   desc "exec", "Execute command with declared LL"
   def exec(*argv)
-    load_llenv_file!
-    check_homedir!
-    load_declare!
-    @declare.execute(argv)
+    check_root_dir!
+    @declare.execute(llenv, argv)
   end
 
   desc "version", "Display LLenv gem version"
-
   map ["-v", "--version"] => :version
   def version
     puts LLenv::VERSION
@@ -37,27 +42,18 @@ private ######################################################################
     exit 1
   end
 
-  def load_llenv_file!
-    root = File.expand_path(Dir.pwd)
-    default_env = File.join(root, ".llenv")
-    error("#{default_env} does not exist.") unless File.exist?(default_env)
-    @llenv = File.read(default_env).split("\n")[0]
-  end
-
-  def check_homedir!
-    home = options[:home] || File.expand_path("~/.llenv")
-    llhome = File.join(home, @llenv)
-    Dir.mkdir(home) unless File.directory?(home)
-    Dir.mkdir(llhome) unless File.directory?(llhome)
-    @llhome = llhome
+  def llenv
+    pwd = File.expand_path(Dir.pwd)
+    llenv_file = File.join(pwd, ".llenv")
+    error("#{llenv_file} does not exist.") unless File.exist?(llenv_file)
+    llenv = File.read(llenv_file).split("\n")[0]
+    llenv
   end
 
-  def load_declare!
-    declare_dirs = []
-    declare_dirs << File.join(options[:declare], @llenv) if options[:declare]
-    declare_dirs << File.expand_path("../../../declare/#{@llenv}", __FILE__)
-    dir = declare_dirs.detect { |d| File.directory?(d) } or error("Declare of '#{@llenv}' does not exist.")
-    @declare = LLenv::Declare.new(dir, @llhome)
+  def check_root_dir!
+    unless File.directory?(@root_dir)
+      system("git clone #{@declare_repo} #{@root_dir} > /dev/null 2>&1") or error("git clone #{@declare_repo}")
+    end
   end
 
 end

data/lib/llenv/declare.rb

@@ -1,32 +1,46 @@
 require "llenv"
 
 class LLenv::Declare
-  def initialize(dir, llhome)
-    @install_sh = File.join(dir, "install.sh")
-    @exec_sh    = File.join(dir, "exec.sh")
-    @llhome     = llhome
+  def initialize(dir)
+    @root_dir = dir
   end
 
-  def install
-    set_env
-    system(@install_sh)
+  def install(llenv)
+    set_env(llenv)
+    install_sh = File.join(@declare_dir, "install.sh")
+    system(install_sh)
   end
 
-  def execute(argv)
-    set_env
-    exec(@exec_sh, *argv)
+  def execute(llenv, argv)
+    set_env(llenv)
+    exec_sh = File.join(@declare_dir, "exec.sh")
+    exec(exec_sh, *argv)
+  end
+
+  def list
+    Dir.entries(@root_dir).each do |f|
+      next if f =~ /^\./
+      next unless File.directory?(File.join(@root_dir, f))
+      print f + "\n"
+    end
   end
 
 private
 
-  def set_env
+  def set_env(llenv)
+    @declare_dir = File.join(@root_dir, llenv)
+    raise "#{llenv} not declared in #{@root_dir}" unless File.directory?(@declare_dir)
+
     ENV.clear
     env = `. /etc/profile && env`
     env.split("\n").map do |e|
       k, v = e.split("=")
       ENV[k] = v
     end
-    ENV["HOME"] = @llhome
+
+    home = File.join(@declare_dir, ".home")
+    Dir.mkdir(home) unless File.directory?(home)
+    ENV["HOME"] = home
     ENV["SHELL"] = "/bin/bash"
   end
 

data/lib/llenv/version.rb

@@ -1,3 +1,3 @@
 module LLenv
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-llenv
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -42,14 +42,6 @@ files:
 - README.md
 - Rakefile
 - bin/llenv
-- declare/node-0.9.3/exec.sh
-- declare/node-0.9.3/install.sh
-- declare/perl-5.16.2/exec.sh
-- declare/perl-5.16.2/install.sh
-- declare/python-2.7.3/exec.sh
-- declare/python-2.7.3/install.sh
-- declare/ruby-1.9.3-p327/exec.sh
-- declare/ruby-1.9.3-p327/install.sh
 - lib/llenv.rb
 - lib/llenv/cli.rb
 - lib/llenv/declare.rb

data/declare/node-0.9.3/exec.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-source "$HOME/nvm/nvm.sh"
-nvm use v0.9.3 > /dev/null
-export PATH="./node_modules/.bin:$PATH"
-
-exec "$@"

data/declare/node-0.9.3/install.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-if ! [ -d "$HOME/nvm" ]; then
-  git clone git://github.com/creationix/nvm.git "$HOME/nvm"
-fi
-
-source "$HOME/nvm/nvm.sh"
-
-if ! [ -d "$HOME/nvm/v0.9.3" ]; then
-  nvm install v0.9.3
-fi
-
-nvm use v0.9.3
-npm install

data/declare/perl-5.16.2/exec.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-source $HOME/perl5/perlbrew/etc/bashrc
-export PERL5OPT="-Mlib=./local/lib/perl5"
-export PATH="./local/bin:$PATH"
-
-exec "$@"

data/declare/perl-5.16.2/install.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-if ! [ -f $HOME/perl5/perlbrew/etc/bashrc ]; then
-  curl -kL http://install.perlbrew.pl | bash
-fi
-
-source $HOME/perl5/perlbrew/etc/bashrc
-
-if [ "$PERLBREW_PERL" != "perl-5.16.2" ]; then
-  perlbrew install perl-5.16.2 -n -j 2
-  perlbrew switch perl-5.16.2
-fi
-
-if [ -z "$(which cpanm)" ]; then
-  perlbrew install-cpanm
-fi
-
-cpanm -v -l local --installdeps .

data/declare/python-2.7.3/exec.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-source "$HOME/.pythonbrew/etc/bashrc"
-source "$HOME/.pythonbrew/pythons/Python-2.7.3/bin/virtualenvwrapper.sh"
-workon env
-
-exec "$@"

data/declare/python-2.7.3/install.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-if ! [ -f "$HOME/.pythonbrew/etc/bashrc" ]; then
-  curl -kL http://xrl.us/pythonbrewinstall | bash
-fi
-
-source "$HOME/.pythonbrew/etc/bashrc"
-
-if ! [[ "$PYTHONPATH" =~ Python-2.7.3  ]]; then
-  pythonbrew install 2.7.3
-  pythonbrew switch 2.7.3
-fi
-
-if ! [ -f "$HOME/.pythonbrew/pythons/Python-2.7.3/bin/virtualenvwrapper.sh" ]; then
-  pip install virtualenv virtualenvwrapper
-fi
-
-source "$HOME/.pythonbrew/pythons/Python-2.7.3/bin/virtualenvwrapper.sh"
-
-if ! [ -d "$HOME/.virtualenvs/env" ]; then
-  mkvirtualenv env
-fi
-
-workon env
-pip install -r requirements.txt

data/declare/ruby-1.9.3-p327/exec.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-export PATH="$HOME/.rbenv/bin:$PATH"
-eval "$(rbenv init -)"
-
-bundle exec "$@"

data/declare/ruby-1.9.3-p327/install.sh

@@ -1,25 +0,0 @@
-#!/bin/sh
-if ! [ -d $HOME/.rbenv ]; then
-  git clone git://github.com/sstephenson/rbenv.git $HOME/.rbenv
-fi
-
-if ! [ -d $HOME/.rbenv/plugins/ruby-build ]; then
-  git clone git://github.com/sstephenson/ruby-build.git $HOME/.rbenv/plugins/ruby-build
-fi
-
-export PATH="$HOME/.rbenv/bin:$PATH"
-eval "$(rbenv init -)"
-rbenv rehash
-
-if ! [[ $(rbenv version) =~ ^1\.9\.3-p327 ]]; then
-  rbenv install 1.9.3-p327
-  rbenv global 1.9.3-p327
-  rbenv rehash
-fi
-
-if [[ -z $(gem list bundler | grep bundler) ]]; then
-  gem install bundler
-  rbenv rehash
-fi
-
-bundle install --path=vendor/bundle