gitenv 0.0.2 → 0.0.3

data/Gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem 'paint', '~> 0.8.5'
+gem 'commander', '~> 4.1.2'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,10 +1,13 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    commander (4.1.2)
+      highline (~> 1.6.11)
     diff-lcs (1.1.3)
     gem-release (0.4.1)
     gemcutter (0.7.1)
     git (1.2.5)
+    highline (1.6.15)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -36,6 +39,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  commander (~> 4.1.2)
   gem-release
   gemcutter
   jeweler

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/gitenv

@@ -1,4 +1,2 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), '..', 'lib', 'gitenv')
-
-Gitenv::Runner.new.run
+require File.join(File.dirname(__FILE__), '..', 'lib', 'program')

data/gitenv.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gitenv"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["AlphaHydrae"]
-  s.date = "2012-09-21"
+  s.date = "2012-09-23"
   s.description = "Creates symlinks to configuration files in a git repository."
   s.email = "hydrae.alpha@gmail.com"
   s.executables = ["gitenv"]
@@ -31,6 +31,16 @@ Gem::Specification.new do |s|
     "bin/gitenv",
     "gitenv.gemspec",
     "lib/gitenv.rb",
+    "lib/gitenv/actions.rb",
+    "lib/gitenv/all_files.rb",
+    "lib/gitenv/config.rb",
+    "lib/gitenv/context.rb",
+    "lib/gitenv/controller.rb",
+    "lib/gitenv/copy.rb",
+    "lib/gitenv/dot_files.rb",
+    "lib/gitenv/enumerator.rb",
+    "lib/gitenv/symlink.rb",
+    "lib/program.rb",
     "spec/helper.rb",
     "spec/version_spec.rb"
   ]
@@ -45,6 +55,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<paint>, ["~> 0.8.5"])
+      s.add_runtime_dependency(%q<commander>, ["~> 4.1.2"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
@@ -55,6 +66,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<paint>, ["~> 0.8.5"])
+      s.add_dependency(%q<commander>, ["~> 4.1.2"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
@@ -66,6 +78,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<paint>, ["~> 0.8.5"])
+    s.add_dependency(%q<commander>, ["~> 4.1.2"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])

data/lib/gitenv/actions.rb

@@ -0,0 +1,28 @@
+
+module Gitenv
+
+  class Actions
+
+    def initialize
+      @actions = []
+    end
+
+    def each &block
+      @actions.each &block
+    end
+
+    def from path
+      @actions.each{ |a| a.from path }
+      @actions
+    end
+
+    def to path
+      @actions.each{ |a| a.to path }
+      @actions
+    end
+
+    def << action
+      @actions << action
+    end
+  end
+end

data/lib/gitenv/all_files.rb

@@ -0,0 +1,10 @@
+
+module Gitenv
+
+  class AllFiles < FileEnumerator
+
+    def files
+      Dir.entries(@path).select{ |f| File.file? File.join(@path, f) }
+    end
+  end
+end

data/lib/gitenv/config.rb

@@ -0,0 +1,53 @@
+
+module Gitenv
+
+  class Config
+    include Context
+
+    attr_reader :actions
+    attr_reader :repository
+    attr_reader :home
+
+    def initialize home
+      @home = home
+      @actions = Actions.new
+    end
+
+    def repo path
+      @repository = File.expand_path path
+    end
+
+    def symlink file
+
+      scope = self
+      current_actions = Actions.new
+      enumerator(file).each do |f|
+        current_actions << Symlink.new(scope, f).tap do |action|
+          @actions << action
+        end
+      end
+
+      current_actions
+    end
+
+    def all_files
+      :all_files
+    end
+
+    def dot_files
+      :dot_files
+    end
+
+    private
+
+    def enumerator file
+      if file == :all_files
+        AllFiles.new File.join(*[@repository, from_path].compact)
+      elsif file == :dot_files
+        DotFiles.new File.join(*[@repository, from_path].compact)
+      else
+        [ file ]
+      end
+    end
+  end
+end

data/lib/gitenv/context.rb

@@ -0,0 +1,46 @@
+
+module Gitenv
+
+  module Context
+
+    def from path, &block
+      (@from_path ||= []) << path
+      if block
+        instance_eval &block
+        @from_path.pop
+      end
+    end
+
+    def from_path
+      @from_path ? File.join(*@from_path) : nil
+    end
+
+    def from_paths
+      @from_path || []
+    end
+
+    def from_paths= paths
+      @from_path = paths
+    end
+
+    def to path, &block
+      (@to_path ||= []) << path
+      if block
+        instance_eval &block
+        @to_path.pop
+      end
+    end
+
+    def to_path
+      @to_path ? File.join(*@to_path) : nil
+    end
+
+    def to_paths
+      @to_path || []
+    end
+
+    def to_paths= paths
+      @to_path = paths
+    end
+  end
+end

data/lib/gitenv/controller.rb

@@ -0,0 +1,46 @@
+
+module Gitenv
+
+  class Controller
+
+    def initialize action, options
+
+      @action = action
+      @options = options
+
+      @home = File.expand_path '~'
+      @config = Config.new @home
+    end
+
+    def run
+      load_config_file!
+      @config.actions.each &:build!
+      @config.actions.each &:update! if @action == :update
+      @config.actions.each{ |a| puts a }
+    end
+
+    private
+
+    def load_config_file!
+      
+      config_file = @options.config ? File.expand_path(@options.config) : File.join(@home, '.gitenv.rb')
+      if !File.exists?(config_file) and @options.config
+        abort "No such configuration file #{config_file}"
+      elsif !File.exists?(config_file)
+        abort "You must create a configuration file #{config_file} or load another one with the --config option"
+      elsif !File.file?(config_file)
+        abort "Configuration file #{config_file} is not a file"
+      elsif !File.readable?(config_file)
+        abort "Configuration file #{config_file} is not readable"
+      end
+
+      contents = File.open(config_file, 'r').read
+      @config.instance_eval contents, config_file
+    end
+
+    def abort msg, code = 1
+      warn ms
+      exit code
+    end
+  end
+end

data/lib/gitenv/copy.rb

@@ -0,0 +1,13 @@
+
+module Gitenv
+
+  class Copy
+    include Context
+
+    def initialize config, file
+      @config, @file = config, file
+      self.from_paths = config.from_paths.dup
+      self.to_paths = config.to_paths.dup
+    end
+  end
+end

data/lib/gitenv/dot_files.rb

@@ -0,0 +1,10 @@
+
+module Gitenv
+
+  class DotFiles < AllFiles
+
+    def files
+      super.select{ |f| f.match /^\.[^\.]/ }
+    end
+  end
+end

data/lib/gitenv/enumerator.rb

@@ -0,0 +1,20 @@
+
+module Gitenv
+
+  class FileEnumerator
+
+    def initialize path
+      @path = path
+    end
+
+    def files
+      raise '#files not implemented'
+    end
+
+    def each &block
+      files.each do |f|
+        block.call f
+      end
+    end
+  end
+end

data/lib/gitenv/symlink.rb

@@ -0,0 +1,62 @@
+# encoding: UTF-8
+
+module Gitenv
+
+  class Symlink
+    include Context
+
+    def initialize config, file
+      @config, @file = config, file
+      self.from_paths = config.from_paths.dup
+      self.to_paths = config.to_paths.dup
+    end
+
+    def build!
+      @color, @mark, @message = if File.symlink? link
+        @current_target = File.expand_path File.readlink(link)
+        if @current_target == target
+          [ :green, "✓", "ok" ]
+        else
+          [ :yellow, "✗", "currently points to #{@current_target}" ]
+        end
+      elsif File.file? link
+        [ :red, "✗", "is a file" ]
+      elsif File.directory? link
+        [ :red, "✗", "is a directory" ]
+      elsif File.exists? link
+        [ :red, "✗", "exists but is not a symlink" ]
+      else
+        [ :blue, "✓", "is not set up" ]
+      end
+    end
+
+    def update!
+      if !File.exists? link
+        File.symlink target, link
+        @color, @mark, @message = :green, "✓", "ok"
+      end
+    end
+
+    def to_s
+      %/ #{status_mark} #{Paint[link, :cyan]} -> #{target}   #{status_message}/
+    end
+
+    private
+
+    def status_mark
+      Paint["#{@mark}", @color]
+    end
+
+    def status_message
+      Paint["#{@message}", @color]
+    end
+
+    def link
+      File.join(*[ @config.home, to_path, @file].compact)
+    end
+
+    def target
+      File.join(*[ @config.repository, from_path, @file ].compact)
+    end
+  end
+end

data/lib/gitenv.rb

@@ -2,173 +2,9 @@
 require 'paint'
 
 module Gitenv
-  VERSION = '0.0.2'
-
-  class Runner
-
-    def initialize
-      @home = File.expand_path '~'
-      @config_file = File.join @home, '.gitenv.rb'
-    end
-
-    def run
-
-      @dsl = DSL.new
-      @dsl.instance_eval File.open(@config_file, 'r').read, @config_file
-
-      action = ARGV.shift || 'info'
-
-      puts
-      puts "gitenv v#{VERSION}"
-      puts "configuration #{@config_file}"
-      puts
-      case action
-      when 'info'
-        puts Paint["Listing current state", :bright, :bold]
-      when 'update'
-        puts Paint["Creating missing links", :blue, :bold]
-      end
-
-      @dsl.symlinks.each do |link|
-
-        link_file_path = File.join @home, link[:file]
-        real_file = link[:source] || link[:file]
-        real_file_path = File.join File.expand_path(@dsl.repository), real_file
-
-        msg = %/#{Paint[link_file_path, :cyan]} -> #{real_file_path}/
-        data = analyze link_file_path, real_file_path
-
-        case action
-        when 'info'
-          puts %/#{info_mark data}#{msg}   #{info_msg data}/
-        when 'update'
-          unless File.exists? link_file_path
-            File.symlink real_file_path, link_file_path
-          end
-          puts %/#{update_mark data}#{msg}   #{update_msg data}/
-        else
-          raise "No such action #{action}"
-        end
-      end
-
-      puts
-    end
-
-    private
-
-    def update_mark data
-      case data[:status]
-      when :setup
-        Paint[" ✓ ", :green]
-      when :wrong_link
-        Paint[" ✗ ", :yellow]
-      when :not_link
-        Paint[" ✗ ", :yellow]
-      when :void
-        Paint[" ✓ ", :green]
-      else
-        Paint[" ? ", :red]
-      end
-    end
-
-    def update_msg data
-      case data[:status]
-      when :setup
-        Paint["already here", :green]
-      when :wrong_link
-        Paint["skipped (points to #{data[:target]})", :yellow]
-      when :not_link
-        Paint["skipped (not a symlink)", :yellow]
-      when :void
-        Paint["set up", :green]
-      else
-        Paint["unknown", :red]
-      end
-    end
-
-    def info_msg data
-      case data[:status]
-      when :setup
-        Paint["already here", :green]
-      when :wrong_link
-        Paint["points to #{data[:target]}", :yellow]
-      when :not_link
-        Paint["is not a symlink", :red]
-      when :void
-        Paint["is not yet set up", :blue]
-      else
-        Paint["unknown", :red]
-      end
-    end
-
-    def info_mark data
-      case data[:status]
-      when :setup
-        Paint[" ✓ ", :green]
-      when :wrong_link
-        Paint[" ✗ ", :red]
-      when :not_link
-        Paint[" ✗ ", :red]
-      when :void
-        Paint[" ✓ ", :green]
-      else
-        Paint[" ? ", :red]
-      end
-    end
-
-    def analyze link_file_path, real_file_path
-      if File.symlink? link_file_path
-        current_real_file_path = File.expand_path(File.readlink(link_file_path))
-        if current_real_file_path == real_file_path
-          { :status => :setup }
-        else
-          { :status => :wrong_link, :target => current_real_file_path }
-        end
-      elsif File.exists? link_file_path
-        { :status => :not_link }
-      else
-        { :status => :void }
-      end
-    end
-  end
-
-  class DSL
-    attr_reader :repository
-    attr_reader :symlinks
-
-    def initialize
-      @symlinks = []
-    end
-
-    def repo path
-      @repository = File.expand_path path
-      raise unless File.directory? @repository
-    end
-
-    def within path
-      path = File.expand_path path
-      raise unless File.directory? path
-      @within = path
-      yield
-      @within = nil
-    end
-
-    def symlink file, source = nil
-      source ||= file
-      s = source || file
-      f = File.join @repository, s
-      raise "Unknown file #{f}" unless File.exists? f
-      @symlinks << { :file => file, :source => source, :within => @within }
-    end
-
-    def configure &block
-      @self_before_instance_eval = eval "self", block.binding
-      instance_eval &block
-      @self_before_instance_eval = nil
-    end
+  VERSION = '0.0.3'
+end
 
-    def method_missing method, *args, &block
-      @self_before_instance_eval.send method, *args, &block
-    end
-  end
+[ :context, :config, :controller, :symlink, :copy, :enumerator, :all_files, :dot_files, :actions ].each do |lib|
+  require File.join(File.dirname(__FILE__), 'gitenv', lib.to_s)
 end

data/lib/program.rb

@@ -0,0 +1,23 @@
+require File.join File.dirname(__FILE__), 'gitenv'
+require 'commander/import'
+
+program :name, 'gitenv'
+program :version, Gitenv::VERSION
+program :description, 'Symlink manager for git repositories with configuration files.'
+
+command :info do |c|
+  c.action do |args,options|
+    Gitenv::Controller.new(:info, options).run
+  end
+end
+
+command :update do |c|
+  c.action do |args,options|
+    Gitenv::Controller.new(:update, options).run
+  end
+end
+
+global_option '-c', '--config FILE', 'Use a custom configuration file (defaults to ~/.gitenv.rb)'
+
+default_command :info
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitenv
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.5
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +193,16 @@ files:
 - bin/gitenv
 - gitenv.gemspec
 - lib/gitenv.rb
+- lib/gitenv/actions.rb
+- lib/gitenv/all_files.rb
+- lib/gitenv/config.rb
+- lib/gitenv/context.rb
+- lib/gitenv/controller.rb
+- lib/gitenv/copy.rb
+- lib/gitenv/dot_files.rb
+- lib/gitenv/enumerator.rb
+- lib/gitenv/symlink.rb
+- lib/program.rb
 - spec/helper.rb
 - spec/version_spec.rb
 homepage: http://github.com/AlphaHydrae/gitenv