trout 0.2 → 0.3

data/features/sync_nested_file.feature

@@ -0,0 +1,43 @@
+Feature: sync a file nested within a directory the source repo
+
+  Scenario: sync a nested file
+    Given a directory named "upstream_repo"
+    And a directory named "child_repo"
+    And a file named "upstream_repo/sub/dir/file" with:
+      """
+      contents
+      """
+    When I cd to "upstream_repo"
+    And I run "git init"
+    And I run "git add sub"
+    And I run "git commit -m 'Added file'"
+    And I cd to "../child_repo"
+    And I run "trout checkout --source-root sub/dir file ../upstream_repo"
+    Then the output should contain:
+      """
+      Checked out file from ../upstream_repo.
+      """
+    And I run "cat file"
+    Then the output should contain:
+      """
+      contents
+      """
+    When I cd to "../upstream_repo"
+    And I write to "sub/dir/file" with:
+      """
+      new contents
+      """
+    When I run "git add sub"
+    And I run "git commit -m 'updated file'"
+    And I cd to "../child_repo"
+    When I run "trout update file"
+    Then the output should contain:
+      """
+      Merged changes to file.
+      """
+    When I run "cat file"
+    Then the output should contain:
+      """
+      new contents
+      """
+

data/lib/trout/cli.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'trout/managed_file'
+require 'trout/version_list'
 
 module Trout
   class CLI
@@ -7,24 +8,29 @@ module Trout
       new(arguments).run
     end
 
-    attr_accessor :command, :option_parser, :arguments, :file
+    attr_accessor :command, :option_parser, :arguments, :managed_files, :file_attributes
 
     def initialize(arguments)
-      self.arguments     = arguments
-      self.option_parser = parse_options
+      self.arguments       = arguments
+      self.file_attributes = {}
+      self.option_parser   = parse_options
+      self.managed_files   = VersionList.new('.trout')
     end
 
     def run
       case command
       when 'checkout'
-        build_file
-        git_url = next_argument
+        file_attributes[:filename] = next_argument
+        file_attributes[:git_url]  = next_argument
+        file = ManagedFile.new(file_attributes)
         end_arguments
-        file.copy_from(git_url)
+        file.checkout
+        managed_files << file
       when 'update'
-        build_file
+        file = managed_files[next_argument]
         end_arguments
         file.update
+        managed_files << file
       when 'help', nil
         puts option_parser
         if arguments_left?
@@ -48,6 +54,9 @@ module Trout
         parser.separator "Options:"
         parser.separator ""
 
+        parser.on("-s", "--source-root PATH", "Path to the file in the source repository") do |path|
+          file_attributes[:source_root] = path
+        end
         parser.on("-h", "--help", "View this help document")
 
         parser.separator ""
@@ -87,10 +96,6 @@ module Trout
       invalid_arguments if arguments_left?
     end
 
-    def build_file
-      self.file = ManagedFile.new(next_argument)
-    end
-
     def usage_for(command)
       case command
       when 'checkout'

data/lib/trout/managed_file.rb

@@ -1,45 +1,53 @@
 require 'fileutils'
-require 'trout/version_list'
 
 module Trout
   class ManagedFile
-    attr_reader :filename, :checked_out_url
+    attr_accessor :filename, :git_url, :version, :latest_version, :source_root
 
-    def initialize(filename)
-      @filename = filename
+    def initialize(attributes)
+      self.filename    = attributes[:filename]
+      self.git_url     = attributes[:git_url]
+      self.version     = attributes[:version]
+      self.source_root = attributes[:source_root] || '/'
     end
 
-    def copy_from(git_url)
-      checkout(git_url)
+    def checkout
+      clone_repository
       copy_to_destination
-      write_url_and_version
       puts "Checked out #{filename} from #{git_url}."
     ensure
       cleanup
     end
 
     def update
-      checkout(previous_git_url)
+      clone_repository
       if up_to_date?
         puts "#{filename} already up to date."
       else
         merge_to_destination
-        write_url_and_version
         puts "Merged changes to #{filename}."
       end
     ensure
       cleanup
     end
 
+    def to_hash
+      { :filename    => filename,
+        :git_url     => git_url,
+        :version     => version,
+        :source_root => source_root }
+    end
+
     private
 
-    def checkout(git_url)
+    def clone_repository
       run_or_fail("git clone #{git_url} #{working('git')}")
-      @checked_out_url = git_url
+      self.latest_version = checked_out_version
     end
 
     def copy_to_destination
-      FileUtils.cp(working('git', filename), filename)
+      FileUtils.cp(working('git', source_path), filename)
+      self.version = checked_out_version
     end
 
     def merge_to_destination
@@ -47,17 +55,19 @@ module Trout
       at_last_update = working('at_last_update')
       merge          = working('merge')
 
-      FileUtils.cp(working('git', filename), upstream)
+      FileUtils.cp(working('git', source_path), upstream)
 
       checkout_last_version
-      FileUtils.cp(working('git', filename), at_last_update)
+      FileUtils.cp(working('git', source_path), at_last_update)
 
       enforce_newline(upstream)
       enforce_newline(at_last_update)
       enforce_newline(filename)
 
-      run("diff3 -mX #{filename} #{at_last_update} #{upstream} > #{merge}")
+      run("diff3 -mE #{filename} #{at_last_update} #{upstream} > #{merge}")
       FileUtils.mv(merge, filename)
+
+      self.version = latest_version
     ensure
       FileUtils.rm_rf(upstream)
       FileUtils.rm_rf(at_last_update)
@@ -65,45 +75,26 @@ module Trout
 
     def cleanup
       FileUtils.rm_rf(working('git'))
-      @checked_out_url = nil
     end
 
     def prepare_working_directory
       FileUtils.mkdir(working_root)
     end
 
-    def write_url_and_version
-      version_list.update(filename,
-                          'git_url' => checked_out_url,
-                          'version' => checked_out_version)
-    end
-
     def checked_out_version
       git_command("rev-parse master")
     end
 
     def checkout_last_version
-      git_command("checkout #{previous_git_version}")
+      git_command("checkout #{version}")
     end
 
     def git_command(command)
       run_or_fail("git --git-dir=#{working('git/.git')} --work-tree=#{working('git')} #{command}").strip
     end
 
-    def previous_git_url
-      version_list.git_url_for(filename)
-    end
-
-    def previous_git_version
-      version_list.version_for(filename)
-    end
-
     def up_to_date?
-      previous_git_version == checked_out_version
-    end
-
-    def version_list
-      @version_list ||= VersionList.new('.trout')
+      version == latest_version
     end
 
     def working(*paths)
@@ -127,5 +118,9 @@ module Trout
       end
       output
     end
+
+    def source_path
+      File.join(source_root, filename)
+    end
   end
 end

data/lib/trout/version_list.rb

@@ -1,43 +1,47 @@
 require 'yaml'
+require 'trout/managed_file'
 
 module Trout
   class VersionList
-    attr_reader :path, :entries
+    FILE_VERSION = '1.0'
+
+    attr_accessor :path, :data, :files
 
     def initialize(path)
       @path = path
     end
 
-    def git_url_for(filename)
+    def [](filename)
       read
-      entries[filename]['git_url']
+      attributes = files[filename] || { :filename => filename }
+      ManagedFile.new(attributes)
     end
 
-    def version_for(filename)
+    def []=(filename, managed_file)
       read
-      entries[filename]['version']
+      files[filename] = managed_file.to_hash
+      write
     end
 
-    def update(filename, info)
-      read
-      entries[filename] ||= {}
-      entries[filename].update(info)
-      write
+    def <<(managed_file)
+      self[managed_file.filename] = managed_file
     end
 
     private
 
     def read
       if File.exist?(path)
-        @entries = YAML.load(IO.read(path))
+        self.data = YAML.load(IO.read(path))
       else
-        @entries = {}
+        self.data = { :files   => {},
+                      :version => FILE_VERSION }
       end
+      self.files = data[:files]
     end
 
     def write
       File.open(path, 'w') do |file|
-        file.write(YAML.dump(entries))
+        file.write(YAML.dump(data))
       end
     end
   end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: trout
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Joe Ferris
@@ -14,11 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -04:00
+date: 2010-09-28 00:00:00 -04:00
 default_executable: trout
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: cucumber
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
   type: :development
-  name: cucumber
-  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: aruba
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -41,10 +43,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   type: :development
-  name: aruba
-  prerelease: false
+  version_requirements: *id002
 description: |-
   Trout allows you to maintain a base version of special
         files (like Gemfile) in one repository, and then syncronize just that
@@ -72,6 +72,7 @@ files:
 - features/help.feature
 - features/support/env.rb
 - features/sync_gemfile.feature
+- features/sync_nested_file.feature
 - bin/trout
 has_rdoc: true
 homepage: http://github.com/jferris/trout
@@ -111,3 +112,4 @@ test_files:
 - features/help.feature
 - features/support/env.rb
 - features/sync_gemfile.feature
+- features/sync_nested_file.feature