reflection 0.4.4 → 0.4.5

data/History.rdoc

@@ -0,0 +1,10 @@
+=== current HEAD
+    
+=== 0.4.5 / 2009-11-19
+
+* enhancements
+  * Added --force option to skip moments of user-interaction
+  * Replaced FileUtils#methods with its native brothers to gain more speed (and to preserve your cpu)
+  
+* fixed
+  * Fixed no-working repository-pull

data/README.rdoc

@@ -103,6 +103,7 @@ If you have a <tt>reflection.yml</tt> config file in your current application-de
           --rails-env [ENV]            Rails environment to instrument
           --write [FILE]               Create a configuration FILE from the current commandline options
       -v, --verbose                    Include debug information in output
+          --force                      Hide tedious warnings
       
 
 == Note on Patches/Pull Requests

data/Reflection.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{reflection}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andreas Wolff"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     ".document",
      ".gitignore",
      ".yardoc",
+     "History.rdoc",
      "LICENSE",
      "README.rdoc",
      "Rakefile",

data/TODO

@@ -5,4 +5,5 @@
   + Allow to apply any (git) version, not just the latest
 + Add cli option use tmp-apply (removes ~/.reflection/apply-dir after command) 
 + Allow collection of assets from Akamai and/or CloudFront (hm.. does that make sense?)
-+ Add option to output --version
++ Add option to output --version
+- Remove ruby-git dependency

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/reflection/command/apply.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module Reflection
   module Command
     class Apply < Reflection::Command::Base
@@ -16,8 +14,10 @@ module Reflection
         stash_directory = Directory::Stash.new(Reflection::Repository.new(config.repository), 'apply')
         target_directory = Directory::Base.new(config.directory)
 
-        get_user_approval_for_cleaning_target(target_directory)
-        get_user_approval_for_apply_database_dump if config.rails_root
+        unless config.force
+          get_user_approval_for_cleaning_target(target_directory)
+          get_user_approval_for_apply_database_dump if config.rails_root
+        end
         
         verify_that_target_is_not_a_repository(target_directory)
 
@@ -45,8 +45,9 @@ module Reflection
 
       private
 
-        def get_user_approval_for_cleaning_target(target_directory)
-          puts "\nIn order to get a fresh copy of your files, Reflection will have to remove all files under '#{target_directory.path}'."
+        def get_user_approval_for_cleaning_target(target_directory)          
+          puts "\nIn order to get a fresh copy of your files, "
+          puts "Reflection will have to remove all files under '#{target_directory.path}'."
           puts "If you are sure, hit <enter> to proceed.."
           
           unless STDIN.getc == 10

data/lib/reflection/command/stash.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module Reflection
   module Command
     class Stash < Reflection::Command::Base
@@ -48,7 +46,7 @@ module Reflection
       private
 
         def copy_stash_repository_git_index_to_target(source, target)
-          FileUtils.cp_r(source, target)
+          %x(cp -R #{source} #{target})
         end
 
         def commit_and_push_files(repository_path, target)
@@ -58,8 +56,8 @@ module Reflection
         end
 
         def move_stash_repository_git_index_back(source, target)
-          FileUtils.rm_r(File.join(target, "/.git"))
-          FileUtils.mv(source, target)
+          %x(rm -r #{File.join(target, "/.git")})
+          %x(mv #{source} #{target})
         end
 
     end

data/lib/reflection/config.rb

@@ -15,6 +15,7 @@ module Reflection
     attr_accessor :rails_environment
     attr_accessor :store_configuration_path
     attr_accessor :verbose
+    attr_accessor :force
     
     def self.parse(args = [])
       config = Config.new
@@ -33,11 +34,12 @@ module Reflection
     def to_hash
       { 
         :command => self.command, 
-        :repository => self.repository, 
         :directory => self.directory,
+        :repository => self.repository, 
         :rails_root => self.rails_root,
         :rails_environment => self.rails_environment,
-        :verbose => self.verbose
+        :verbose => self.verbose,
+        :force => self.force
       }
     end
     
@@ -48,6 +50,7 @@ module Reflection
       self.rails_root = hash[:rails_root]
       self.rails_environment = hash[:rails_environment]
       self.verbose = Reflection.verbose = hash[:verbose]
+      self.force = hash[:force]
     end
 
     def write(path)
@@ -119,6 +122,10 @@ module Reflection
           self.verbose = true
           Reflection.verbose = true
         end
+
+        opts.on("--force", "Hide tedious warnings") do
+          self.force = true
+        end
       end
 
       opt_parser.parse!(args)

data/lib/reflection/directory/base.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module Reflection
   module Directory
     class Base
@@ -37,7 +35,7 @@ module Reflection
       
       def copy_git_index_to(target_path)
         Reflection.log.debug "Copying git-index '#{self.git_index}' to #{target_path}"
-        FileUtils.cp_r(self.git_index, target_path)
+        %x(cp -R #{self.git_index} #{target_path})
       end
       
       def get_git_index_from(target_path)
@@ -50,8 +48,8 @@ module Reflection
       
       def move_content_to(target_path)
         Reflection.log.debug "Moving content to '#{target_path}'.."
-        FileUtils.cp_r(File.join(self.path, '/.'), target_path)
-        FileUtils.rm_r(File.join(self.path, '/'))
+        %x(cp -R #{File.join(self.path, '/.')} #{target_path})
+        %x(rm -rf #{self.path})
       end
       
     end

data/lib/reflection/repository.rb

@@ -62,9 +62,8 @@ module Reflection
     end
     
     def pull
-      repo = Git.open(self.path)
-      Reflection.log.debug "Pulling.."
-      Reflection.log.debug(repo.pull)
+      Reflection.log.debug "Pulling in #{self.path}.."
+      Reflection.log.debug(%x((cd #{self.path} && git pull --rebase)))
     end
     
   end

data/spec/reflection/config_spec.rb

@@ -8,7 +8,8 @@ describe Reflection::Config do
       :directory => 'dir', 
       :rails_root => "rails_root", 
       :rails_environment => 'development',
-      :verbose => true
+      :verbose => true,
+      :force => false
     }
   end
   
@@ -51,6 +52,7 @@ describe Reflection::Config do
       @config.rails_root = 'rails_root'
       @config.rails_environment = 'development'
       @config.verbose = true
+      @config.force = false
       @config.to_hash.should == @valid_options
     end
   end
@@ -65,6 +67,7 @@ describe Reflection::Config do
       @config.rails_root.should eql('rails_root')
       @config.rails_environment.should eql('development')
       @config.verbose.should be_true
+      @config.force.should be_false
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reflection
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Andreas Wolff
@@ -45,6 +45,7 @@ files:
 - .document
 - .gitignore
 - .yardoc
+- History.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile