gitenv 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/gitenv.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gitenv"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["AlphaHydrae"]
@@ -31,14 +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/action.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/enumerator/all_files.rb",
+    "lib/gitenv/enumerator/dot_files.rb",
+    "lib/gitenv/enumerator/enumerator.rb",
+    "lib/gitenv/enumerator/one_file.rb",
     "lib/gitenv/symlink.rb",
     "lib/program.rb",
     "spec/helper.rb",

data/lib/gitenv.rb

@@ -2,9 +2,9 @@
 require 'paint'
 
 module Gitenv
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end
 
-[ :context, :config, :controller, :symlink, :copy, :enumerator, :all_files, :dot_files, :actions ].each do |lib|
+[ :context, :config, :controller, :symlink, :copy, :enumerator, :action ].each do |lib|
   require File.join(File.dirname(__FILE__), 'gitenv', lib.to_s)
 end

data/lib/gitenv/action.rb

@@ -0,0 +1,18 @@
+
+module Gitenv
+
+  class Action
+    include Context
+    
+    def initialize config, type, files
+      @type, @files = type, files
+      copy! config
+    end
+
+    def each &block
+      @files.each File.join(*[repository, from_path].compact) do |f|
+        block.call @type.new(self, f)
+      end
+    end
+  end
+end

data/lib/gitenv/config.rb

@@ -10,7 +10,7 @@ module Gitenv
 
     def initialize home
       @home = home
-      @actions = Actions.new
+      @actions = []
     end
 
     def repo path
@@ -18,16 +18,7 @@ module Gitenv
     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
+      Action.new(self, Symlink, enumerator(file)).tap{ |a| @actions << a }
     end
 
     def all_files
@@ -42,11 +33,11 @@ module Gitenv
 
     def enumerator file
       if file == :all_files
-        AllFiles.new File.join(*[@repository, from_path].compact)
+        AllFiles.new
       elsif file == :dot_files
-        DotFiles.new File.join(*[@repository, from_path].compact)
+        DotFiles.new
       else
-        [ file ]
+        OneFile.new file
       end
     end
   end

data/lib/gitenv/context.rb

@@ -2,45 +2,38 @@
 module Gitenv
 
   module Context
+    attr_accessor :home, :repository
+    attr_accessor :from_paths, :to_paths
 
     def from path, &block
-      (@from_path ||= []) << path
+      (@from_paths ||= []) << path
       if block
         instance_eval &block
-        @from_path.pop
+        @from_paths.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
+      @from_paths ? File.join(*@from_paths) : nil
     end
 
     def to path, &block
-      (@to_path ||= []) << path
+      (@to_paths ||= []) << path
       if block
         instance_eval &block
-        @to_path.pop
+        @to_paths.pop
       end
     end
 
     def to_path
-      @to_path ? File.join(*@to_path) : nil
-    end
-
-    def to_paths
-      @to_path || []
+      @to_paths ? File.join(*@to_paths) : nil
     end
 
-    def to_paths= paths
-      @to_path = paths
+    def copy! source
+      self.from_paths = source.from_paths ? source.from_paths.dup : []
+      self.to_paths = source.to_paths ? source.to_paths.dup : []
+      self.repository = source.repository
+      self.home = source.home
     end
   end
 end

data/lib/gitenv/controller.rb

@@ -14,9 +14,13 @@ module Gitenv
 
     def run
       load_config_file!
-      @config.actions.each &:build!
-      @config.actions.each &:update! if @action == :update
-      @config.actions.each{ |a| puts a }
+      @config.actions.each do |a|
+        a.each do |impl|
+          impl.build!
+          impl.update! if @action == :update
+          puts impl
+        end
+      end
     end
 
     private

data/lib/gitenv/copy.rb

@@ -6,8 +6,7 @@ module Gitenv
 
     def initialize config, file
       @config, @file = config, file
-      self.from_paths = config.from_paths.dup
-      self.to_paths = config.to_paths.dup
+      copy! config
     end
   end
 end

data/lib/gitenv/enumerator.rb

@@ -1,20 +1,3 @@
-
-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
+[ :enumerator, :all_files, :dot_files, :one_file ].each do |lib|
+  require File.join(File.dirname(__FILE__), 'enumerator', lib.to_s)
 end

data/lib/gitenv/enumerator/all_files.rb

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

data/lib/gitenv/enumerator/dot_files.rb

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

data/lib/gitenv/enumerator/enumerator.rb

@@ -0,0 +1,14 @@
+
+module Gitenv
+
+  class FileEnumerator
+
+    def files path
+      raise '#files not implemented'
+    end
+
+    def each path, &block
+      files(path).each{ |f| block.call f }
+    end
+  end
+end

data/lib/gitenv/enumerator/one_file.rb

@@ -0,0 +1,14 @@
+
+module Gitenv
+
+  class OneFile < FileEnumerator
+
+    def initialize file
+      @file = file
+    end
+
+    def files path
+      [ @file ]
+    end
+  end
+end

data/lib/gitenv/symlink.rb

@@ -7,8 +7,7 @@ module Gitenv
 
     def initialize config, file
       @config, @file = config, file
-      self.from_paths = config.from_paths.dup
-      self.to_paths = config.to_paths.dup
+      copy! config
     end
 
     def build!

data/lib/program.rb

@@ -17,7 +17,8 @@ command :update do |c|
   end
 end
 
-global_option '-c', '--config FILE', 'Use a custom configuration file (defaults to ~/.gitenv.rb)'
+global_option '-r', '--repo PATH', 'Specify the path to the environment repository'
+global_option '-c', '--config PATH', '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.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -193,14 +193,16 @@ files:
 - bin/gitenv
 - gitenv.gemspec
 - lib/gitenv.rb
-- lib/gitenv/actions.rb
-- lib/gitenv/all_files.rb
+- lib/gitenv/action.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/enumerator/all_files.rb
+- lib/gitenv/enumerator/dot_files.rb
+- lib/gitenv/enumerator/enumerator.rb
+- lib/gitenv/enumerator/one_file.rb
 - lib/gitenv/symlink.rb
 - lib/program.rb
 - spec/helper.rb

data/lib/gitenv/actions.rb

@@ -1,28 +0,0 @@
-
-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

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

data/lib/gitenv/dot_files.rb

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