roll 1.1.0 → 1.2.0

data/lib/roll/commands/env.rb

@@ -0,0 +1,24 @@
+module Roll
+
+  # Show environment.
+  class CommandEnv < Command
+
+    #
+    def setup
+      op.banner = "Usage: roll env [NAME]"
+      op.separator "Show current environment."
+    end
+
+    #
+    def call
+      env = Roll.env(*args)
+      puts env.name + ':'
+      env.lookup.each do |(path, depth)|
+        puts "- #{path} #{depth}"
+      end
+    end
+
+  end
+
+end
+

data/lib/roll/commands/help.rb

@@ -0,0 +1,30 @@
+module Roll
+
+  #
+  class CommandHelp < Command
+
+    #
+    def setup
+      op.banner = "USAGE:\n   roll <COMMAND> [--OPT1 --OPT2 ...]\n\n" +
+                  "Use 'roll <COMMAND> --help' for command details."
+      op.separator " "
+      op.separator "COMMANDS:"
+      op.separator "    in  [DIR] " + (" " * 23) + "Roll directory into current environment."
+      op.separator "    out [DIR] " + (" " * 23) + "Remove directory from current environment."
+      op.separator "    env       " + (" " * 23) + "Show current environment."
+      op.separator "    index     " + (" " * 23) + "Show current environment index."
+      op.separator "    sync      " + (" " * 23) + "Synchronize environment indexes."
+      op.separator "    path      " + (" " * 23) + "Output bin PATH list."
+      op.separator "    verify    " + (" " * 23) + "Verify project dependencies in current environment."
+      op.separator " "
+      op.separator "OPTIONS:"
+    end
+
+    #
+    def call
+      puts op
+    end
+
+  end
+
+end

data/lib/roll/commands/in.rb

@@ -0,0 +1,26 @@
+module Roll
+
+  #
+  class CommandIn < Command
+
+    #
+    def setup
+      op.banner = "Usage: roll in [PATH]"
+      op.separator "Insert path into current environment."
+      op.separator "Options:"
+      op.on("--depth", "-d INTEGER") do |int|
+        opts[:depth] = int
+      end
+    end
+
+    #
+    def call
+      path  = File.expand_path(args.first || Dir.pwd)
+      depth = opts[:depth]
+      path, file = *Roll.in(path, depth)
+      puts "#{path}"
+      puts "  '-> #{file}"
+    end
+
+  end
+end

data/lib/roll/commands/index.rb

@@ -0,0 +1,20 @@
+module Roll
+
+  #
+  class CommandIndex < Command
+
+    #
+    def setup
+      op.banner = "Usage: roll index [NAME]"
+      op.separator "Show current environment index."
+    end
+
+    # Show/Change current environment.
+    #
+    def call
+      puts Roll.index(*args)
+    end
+
+  end
+
+end

data/lib/roll/commands/list.rb

@@ -0,0 +1,33 @@
+module Roll
+
+  # List available environments.
+  class CommandList < Command
+
+    #
+    def setup
+      op.banner = "Usage: roll list"
+      op.separator "List current environments."
+    end
+
+    #
+    def call
+      curr = Roll.env.name
+      envs = Roll.list.sort #(*args)
+      if envs.empty?
+        puts "No environments."        
+      else
+        puts
+        envs.each do |env|
+          if curr == env
+            puts "=> #{env}"
+          else
+            puts "   #{env}"
+          end
+        end
+        puts
+      end
+    end
+
+  end
+
+end

data/lib/roll/commands/out.rb

@@ -0,0 +1,22 @@
+module Roll
+
+  #
+  class CommandOut < Command
+
+    #
+    def setup
+      op.banner = "Usage: roll out [PATH]"
+      op.separator "Remove path from current environment."
+    end
+
+    #
+    def call
+      path = File.expand_path(args.first || Dir.pwd)
+      path, file = *Roll.out(path)
+      puts "#{file}"
+      puts "  '-> #{path} -> [x]"
+    end
+
+  end
+
+end

data/lib/roll/commands/path.rb

@@ -0,0 +1,50 @@
+module Roll
+
+  # This script builds a list of all roll-ready bin locations
+  # and writes that list as an environment setting shell script.
+  # On Linux a call to this to you .bashrc file. Eg.
+  #
+  #   if [ -f ~/.rollrc ]; then
+  #       . roll
+  #   fi
+  #
+  # Currently this only supports bash.
+  #
+  # TODO: It would be better to "install" executables
+  # to an appropriate bin dir, using links (soft if possible).
+  # There could go in ~/.bin or .config/roll/<ledger>.bin/
+  #
+  class CommandPath < Command
+
+    #
+    def setup
+      op.banner = "Usage: roll path"
+      op.separator "Generate executable PATH list."
+    end
+
+    #
+    def call
+      case RUBY_PLATFORM
+      when /mswin/, /wince/
+        div = ';'
+      else
+        div = ':'
+      end
+      env_path = ENV['PATH'].split(/[#{div}]/)
+      # Go thru each roll lib and make sure bin path is in path.
+      binpaths = []
+      Library.list.each do |name|
+        lib = Library[name]
+        if lib.bindir?
+          binpaths << lib.bindir
+        end
+      end
+      #pathenv = (["$PATH"] + binpaths).join(div)
+      pathenv = binpaths.join(div)
+      #puts %{export PATH="#{pathenv}"}
+      puts pathenv
+    end
+
+  end
+
+end

data/lib/roll/commands/sync.rb

@@ -0,0 +1,29 @@
+module Roll
+
+  #
+  class CommandSync < Command
+
+    #
+    def setup
+      op.banner = "Usage: roll sync [NAME]"
+      op.separator "Synchronize ledger(s) to their respective environment(s)."
+    end
+
+    # Synchronize ledgers.
+    #
+    def call
+      name = args.first
+      list = name ? [name] : Environment.list
+      list.each do |name|
+        result = Roll.sync(name)
+        if result
+          puts "   saved #{name}"
+        else
+          puts " current #{name}"
+        end
+      end
+    end
+
+  end
+
+end

data/lib/roll/commands/use.rb

@@ -0,0 +1,25 @@
+module Roll
+
+  # Show/Change current environment.
+  class CommandUse < Command
+
+    #
+    def setup
+      op.banner = "Usage: roll use <NAME>"
+      op.separator "Set current environment. Set name to 'system' to use RUBYENV."
+      #op.on("--clear", "-c") do
+      #  args.unshift 'system'
+      #end
+    end
+
+    #
+    def call
+      name = args.first
+      file = Roll.use(name)
+      puts "Roll environment is now '#{File.read(file).strip}'."
+    end
+
+  end
+
+end
+

data/lib/roll/commands/verify.rb

@@ -0,0 +1,22 @@
+module Roll
+
+  #
+  class CommandVerify < Command
+
+    #
+    def setup
+      op.banner = "Usage: roll verify"
+      op.separator "Verify dependencies in current environment."
+    end
+
+    #
+    def call
+      list = Roll.verify
+      list.each do |(name, constraint)|
+        puts "#{name} #{constraint}"
+      end
+    end
+
+  end
+
+end

data/lib/roll/config.rb

@@ -2,6 +2,9 @@ require 'rbconfig'
 
 module ::Config
 
+  # TODO: use "XDG-lite" rather than XDG.
+
+  #
   HOME = File.expand_path('~') # ENV['HOME']
 
   # Location of user's personal config directory.
@@ -11,11 +14,12 @@ module ::Config
   CONFIG_DIRS = (
     dirs = ENV['XDG_CONFIG_DIRS'].to_s.split(/[:;]/)
     if dirs.empty?
-      dirs = File.join(Config::CONFIG['sysconfdir'], 'xdg')
+      dirs = [File.join(Config::CONFIG['sysconfdir'], 'xdg')]
     end
     dirs.collect{ |d| File.expand_path(d) }
   )
 
+  #
   WIN_PATTERNS = [
     /bccwin/i,
     /cygwin/i,
@@ -41,16 +45,18 @@ module ::Config
   # versioned data directories.
   #++
 
+  #
   def self.datadir(name, versionless=false)
     if lib = Roll::Library.instance(name)
       lib.datadir(versionless)
+    elsif defined?(super)
+      super(name)
     else
       File.join(CONFIG['datadir'], name)
     end
   end
 
   # Return the path to the configuration directory.
-
   def self.confdir(name)
     if lib = Roll::Library.instance(name)
       lib.confdir
@@ -60,7 +66,6 @@ module ::Config
   end
 
   # Lookup configuration file.
-
   def self.find_config(*glob)
     flag = 0
     flag = (flag | glob.pop) while Fixnum === glob.last

data/lib/roll/environment.rb

@@ -1,7 +1,8 @@
+#require File.dirname(__FILE__) + '/config.rb'
+require 'roll/config'
+
 require 'yaml'
 require 'fileutils'
-#require 'roll/xdg'
-require 'roll/config'
 
 module Roll
 
@@ -16,20 +17,48 @@ module Roll
     #--
     # Perhaps combine all enrtries instead?
     #++
-    DIRS = ::Config.find_config('roll')
+    DIRS = ::Config.find_config('roll', 'environments')
+
+    #
+    HOME_ENV_DIR = File.join(::Config::CONFIG_HOME, 'roll', 'environments')
+
+    # File that stores the name of the current environment.
+    CURRENT_FILE = File.join(::Config::CONFIG_HOME, 'roll', 'current')
 
     # Current environment name.
     def self.current
-      ENV['RUBYENV'] || DEFAULT
+      @current ||= (
+        if File.exist?(CURRENT_FILE)
+          env = File.read(CURRENT_FILE).strip
+        else
+          env = ENV['RUBYENV'] || DEFAULT
+        end
+        #warn "#{env} is not a valid environment" unless list.include?(env)
+        env
+      )
     end
 
     # List of available environments.
     def self.list
-      Dir[File.join(DIR, '*')].map do |file|
+      Dir[File.join('{'+DIRS.join(',')+'}', '*')].map do |file|
         File.basename(file)
       end
     end
 
+    # Change environment to given +name+.
+    #
+    # TODO: should only last a long as the shell session,
+    # not change it perminently.
+    #
+    def self.save(name)
+      if name == 'system'
+        FileUtils.rm(CURRENT_FILE)
+      else
+        File.open(CURRENT_FILE,'w'){|f| f << name.to_s}
+      end
+      CURRENT_FILE
+    end
+
     # Environment name.
     attr :name
 
@@ -59,7 +88,9 @@ module Roll
     end
 
     #
-    def each(&block) ; index.each(&block) ; end
+    def each(&block)
+      index.each(&block)
+    end
 
     #
     def size ; index.size ; end
@@ -73,7 +104,6 @@ module Roll
       str
     end
 
-
     # Index tracks the name and location of each library
     # in an environment.
     #--
@@ -96,7 +126,7 @@ module Roll
 
       # Environment file (full-path).
       def file
-        @file ||= ::Config.find_config('roll', name, 'index').first
+        @file ||= ::Config.find_config('roll', 'environments', name, 'index').first
       end
 
       # Load the environment file.
@@ -133,14 +163,14 @@ module Roll
 
       #
       def to_s
-        out = ""
+        out = []
         max = @table.map{ |name, paths| name.size }.max
         @table.map do |name, paths|
           paths.each do |path|
-            out << "%-#{max}s %s\n" % [name, path]
+            out << "%-#{max}s %s" % [name, path]
           end
         end
-        out
+        out.sort.join("\n")
       end
 
       # Save environment file.
@@ -152,7 +182,7 @@ module Roll
         #    out << "%-#{max}s %s\n" % [name, path]
         #  end
         #end
-        file = File.join(::Config::CONFIG_HOME, 'roll', name, 'index')
+        file = File.join(HOME_ENV_DIR, name, 'index')
         if File.exist?(file)
           data = File.read(file)
           if out != data
@@ -173,23 +203,22 @@ module Roll
         @file = file
       end
 
-=begin
-    # Get library version.
-    # TODO: handle VERSION file
-    def load_version(path)
-      file = Dir[File.join(path, '{,.}meta', 'version')].first
-      if file
-        File.read(file).strip  # TODO: handle YAML ?
-      end
-    end
-=end
-
+      # Get library version.
+      # TODO: handle VERSION file
+      #def load_version(path)
+      #  file = Dir[File.join(path, '{,.}meta', 'version')].first
+      #  if file
+      #    File.read(file).strip  # TODO: handle YAML ?
+      #  end
+      #end
     end
 
     # The Lookup class provides a table of paths which
     # make it easy to quickly populate and refresh the
     # environment index.
-
+    #
+    # TODO: Provide a way to specifically exclude a location.
+    # Probaby recognize a path with a '-' prefix.
     class Lookup
       include Enumerable
 
@@ -209,7 +238,7 @@ module Roll
 
       #
       def file
-        @file ||= ::Config.find_config('roll', name, 'lookup').first
+        @file ||= ::Config.find_config('roll', 'environments', name, 'lookup').first
       end
 
       #
@@ -256,10 +285,10 @@ module Roll
 
       #
       def save
-        file = File.join(::Config::CONFIG_HOME, 'roll', name, 'lookup')
+        file = File.join(HOME_ENV_DIR, name, 'lookup')
         out = @table.map do |(path, depth)|
           "#{path}   #{depth}"
-        end
+        end.sort
         dir = File.dirname(file)
         FileUtils.mkdir_p(dir) unless File.exist?(dir)
         File.open(file, 'w') do |f|
@@ -270,18 +299,21 @@ module Roll
 
       # Generate index from lookup list.
       def index
-        set = Hash.new{ |h,k| h[k] = [] }
+        set = Hash.new{|h,k| h[k]=[]}
         locate.each do |path|
-          name = load_name(path)
+          name = libname(path)
+          next if name == 'roll' # NEVER INCLUDE ROLL ITSELF!!!
           #vers = load_version(path)
           if name #&& vers
             set[name] << path
+          else
+            warn "omitting: #{path}"
           end
         end
         set
       end
 
-      #
+      # Locate projects.
       def locate
         locs = []
         each do |dir, depth|
@@ -290,25 +322,35 @@ module Roll
         locs.flatten
       end
 
-      # Search a given directory for projects upto a given depth.
-      # Projects directories are determined by containing a
-      # 'meta' or '.meta' directory.
+      # Search a given directory for projects upto a given depth. Projects
+      # directories are determined by containing a lib/*.rb file.
       def find_projects(dir, depth=3)
         depth = Integer(depth || 3)
         depth = (0...depth).map{ |i| (["*"] * i).join('/') }.join(',')
-        glob = File.join(dir, "{#{depth}}", "{.meta,meta}")
-        meta_locations = Dir[glob]
-        meta_locations.map{ |d| d.chomp('/meta').chomp('/.meta') }
+        find = File.join(dir, "{#{depth}}", "lib/*.rb")
+        locals = Dir.glob(find)
+        locals.map{|d| File.dirname(File.dirname(d)) }.uniq
       end
 
-      # Get library name.
-      def load_name(path)
-        file = Dir[File.join(path, '{,.}meta', 'name')].first
-        if file
-          File.read(file).strip  # TODO: handle YAML
-        end
+      #
+      def metadata(path)
+        @metadata ||= {}
+        @metadata[path] ||= Metadata.new(path)
       end
 
+      #
+      def libname(path)
+        metadata(path).name
+      end
+
+      ## Get library name.
+      #def load_name(path)
+      #  file = Dir[File.join(path, '{,.}meta', 'name')].first
+      #  if file
+      #    File.read(file).strip  # TODO: handle YAML
+      #  end
+      #end
+
     end#class Lookup
 
   end#class Environment