filander 0.6.0 → 0.6.1

data/lib/filander.rb

@@ -7,8 +7,6 @@ require 'filander/actions/copy_directory'
 require 'filander/actions/copy_file'
 require 'filander/actions/create_file'
 require 'filander/actions/empty_directory'
-require 'filander/actions/gem_install'
-require 'filander/actions/git_clone'
 require 'filander/actions/inject_into_file'
 require 'filander/actions/inside'
 require 'filander/actions/template'
@@ -28,16 +26,26 @@ module Filander
         Filander.quiet = value
       end
 
+      def self.verbose(value)
+        Filander.verbose = value
+      end
+
       # can be :pretend, :skip or :force
       def self.behavior(value)
-        Filander.behavior = value
+        return unless value
+        Filander.behavior = value.to_sym
       end
     end
   end
 
   class << self
-    attr_reader :source_root_stack, :destination_root_stack
-    attr_accessor :quiet, :behavior
+    attr_reader :source_root_stack, :destination_root_stack, :behavior
+    attr_accessor :quiet, :verbose
+
+    def behavior=(value)
+      return unless value
+      @behavior = value.to_sym
+    end
 
     def source_root=(dirname)
       add_source_root dirname
@@ -77,8 +85,6 @@ module Filander
   include CopyFile
   include CreateFile
   include EmptyDirectory
-  include GemInstall
-  include GitClone
   include InjectIntoFile
   include Inside
   include Template

data/lib/filander/actions/base.rb

@@ -62,6 +62,7 @@ module Filander
       end
 
       yield unless skip || Filander.behavior == :pretend
+      report nil, content.gsub(/(\n+)/, '\1' + "              ").strip if Filander.verbose
     end
 
     def report(verb, filename)
@@ -79,7 +80,7 @@ module Filander
       end
 
       color = case verb
-              when :create
+              when :create, :clone, :enable
                 :green
               when :force, :skip
                 :yellow

data/spec/filander_spec.rb

@@ -75,8 +75,8 @@ describe "Filander" do
       Filander.included_modules.should include(Filander::Inside)
     end
 
-    it "should include InstallGem" do
-      Filander.included_modules.should include(Filander::InstallGem)
+    it "should include GemInstall" do
+      Filander.included_modules.should include(Filander::GemInstall)
     end
 
     it "should include Template" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: filander
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Johannes J. Schmidt
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 +02:00
+date: 2010-07-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -49,13 +52,30 @@ files:
 - lib/filander/actions/copy_file.rb
 - lib/filander/actions/create_file.rb
 - lib/filander/actions/empty_directory.rb
-- lib/filander/actions/gem_install.rb
-- lib/filander/actions/git_clone.rb
 - lib/filander/actions/inject_into_file.rb
 - lib/filander/actions/inside.rb
 - lib/filander/actions/template.rb
 - LICENSE
 - README.rdoc
+- spec/filander_spec.rb
+- spec/spec_helper.rb
+- spec/filander/actions/copy_directory_spec.rb
+- spec/filander/actions/inside_spec.rb
+- spec/filander/actions/copy_file_spec.rb
+- spec/filander/actions/inject_into_file_spec.rb
+- spec/filander/actions/chown_spec.rb
+- spec/filander/actions/template_spec.rb
+- spec/filander/actions/empty_directory_spec.rb
+- spec/filander/actions/create_file_spec.rb
+- spec/filander/actions/gem_install_spec.rb
+- spec/filander/actions/base_spec.rb
+- spec/filander/actions/cmd_spec.rb
+- spec/filander/actions/git_clone_spec.rb
+- spec/source/myfile
+- spec/source/mydir/myfile
+- spec/source/mydir/mytemplate
+- spec/source/mytemplate
+- spec/spec.opts
 has_rdoc: true
 homepage: http://github.com/jo/filander
 licenses: []
@@ -66,23 +86,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: File manipulation tools

data/lib/filander/actions/gem_install.rb

@@ -1,29 +0,0 @@
-module Filander
-  module GemInstall
-    include Base
-
-    def gem_install(name, version = nil)
-      if version
-        gem_install_args = "-v=#{version} #{name}"
-        report_name = "#{name} #{version}"
-      else
-        gem_install_args = name
-        report_name = name
-      end
-      if gem_exists?(name, version)
-        report :installed, report_name
-      else
-        report :install, report_name
-        unless Filander.behavior == :pretend
-          system "gem install #{gem_install_args}"
-        end
-      end
-    end
-
-    private
-
-    def gem_exists?(name, version)
-      Gem.path.map { |p| File.join(p, 'gems', "#{name}-#{version || '*'}") }.any? { |p| Dir[p].size > 0 }
-    end
-  end
-end

data/lib/filander/actions/git_clone.rb

@@ -1,12 +0,0 @@
-module Filander
-  module GitClone
-    include Base
-
-    def git_clone(repository, destination)
-      report :cloning, repository
-      unless Filander.behavior == :pretend
-        system "git clone #{repository} #{join_destination(destination)}"
-      end
-    end
-  end
-end