trout 0.1

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2010 Joe Ferris
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.textile

@@ -0,0 +1,48 @@
+h1. Trout
+
+So your common files can swim upstream.
+
+h2. Synopsis
+
+Trout allows you to maintain a base version of special files (like Gemfile) in
+one repository, and then syncronize just that file with several other
+repositories. This means that you can update your Gemfile in the master
+repository, and then get the latest of all the common gems that you use in each
+project just by running "trout update Gemfile".
+
+h2. Installation
+
+<pre>
+gem install trout
+</pre>
+
+h2. Usage
+
+Once you have a master repository set up containing the file you want to
+syncronize, you can check out that file anywhere using trout:
+
+<pre>
+trout checkout Gemfile git://github.com/someurl
+</pre>
+
+If you update the file in your master repository and want to get the changes,
+you can use the update command:
+
+<pre>
+trout update Gemfile
+</pre>
+
+If there are any conflicts, trout will help you resolve them by merging the two
+trees using diff3.
+
+h2. Why
+
+I wrote this primarily to manage Gemfiles between projects, hoping to avoid
+using an "ancestor" git repository that gets dumped into the git history of
+every new project. This also solves the "multiple inheritance" problem of git
+repositories if you want to manage different files from different sources.
+
+h2. Author
+
+Copyright 2010 Joe Ferris
+

data/Rakefile

@@ -0,0 +1,23 @@
+require 'rubygems'
+require 'rake'
+require 'date'
+require 'rake/gempackagetask'
+
+require 'cucumber/rake/task'
+
+desc 'Default: run the cucumber features.'
+task :default => :cucumber
+
+desc "Clean files generated by rake tasks"
+task :clobber => [:clobber_rdoc, :clobber_rcov]
+
+Cucumber::Rake::Task.new(:cucumber) do |t|
+  t.fork = true
+  t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
+end
+
+eval("$specification = begin; #{IO.read('trout.gemspec')}; end")
+Rake::GemPackageTask.new($specification) do |package|
+  package.need_zip = true
+  package.need_tar = true
+end

data/bin/trout

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require 'trout'
+Trout::CLI.run(ARGV)
+

data/features/support/env.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'aruba'
+require 'fileutils'
+
+Before do
+  FileUtils.rm_rf("tmp")
+  FileUtils.mkdir("tmp")
+end
+
+PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
+BIN_PATH = File.join(PROJECT_ROOT, 'bin').freeze
+LIB_PATH = File.join(PROJECT_ROOT, 'lib').freeze
+
+ENV['PATH'] = [BIN_PATH, ENV['PATH']].join(':')
+ENV['RUBYLIB'] = LIB_PATH

data/features/sync_gemfile.feature

@@ -0,0 +1,54 @@
+Feature: sync a Gemfile between two repositories
+
+  @puts @announce
+  Scenario: sync a Gemfile
+    Given a directory named "upstream_repo"
+    And a directory named "child_repo"
+    And a file named "upstream_repo/Gemfile" with:
+      """
+      source "http://rubygems.org"
+      gem "rails"
+      gem "mysql"
+      """
+    When I cd to "upstream_repo"
+    And I run "git init"
+    And I run "git add Gemfile"
+    And I run "git commit -m 'Added gemfile'"
+    And I cd to "../child_repo"
+    And I run "trout checkout Gemfile ../upstream_repo"
+    And I run "cat Gemfile"
+    Then the output should contain:
+      """
+      source "http://rubygems.org"
+      gem "rails"
+      gem "mysql"
+      """
+    When I cd to "../upstream_repo"
+    And I write to "Gemfile" with:
+      """
+      source "http://rubygems.org"
+      gem "rails"
+      gem "postgresql"
+      """
+    When I run "git add Gemfile"
+    And I run "git commit -m 'Changed to postgres'"
+    And I cd to "../child_repo"
+    When I append to "Gemfile" with:
+      """
+
+      gem "redcloth"
+      """
+    When I run "trout update Gemfile"
+    And I run "cat Gemfile"
+    Then the output should contain:
+      """
+      source "http://rubygems.org"
+      gem "rails"
+      <<<<<<< Gemfile
+      gem "mysql"
+      gem "redcloth"
+      =======
+      gem "postgresql"
+      >>>>>>> .trout/upstream
+      """
+

data/lib/trout.rb

@@ -0,0 +1,2 @@
+require 'trout/cli'
+

data/lib/trout/cli.rb

@@ -0,0 +1,36 @@
+require 'trout/managed_file'
+
+module Trout
+  class CLI
+    def self.run(arguments)
+      new(arguments).run
+    end
+
+    attr_reader :arguments, :git_url, :filename, :file, :command
+
+    def initialize(arguments)
+      self.arguments = arguments
+      self.file = ManagedFile.new(filename)
+    end
+
+    def run
+      case command
+      when 'checkout'
+        self.git_url = arguments[2]
+        file.copy_from(git_url)
+      when 'update'
+        file.update
+      end
+    end
+
+    private
+
+    def arguments=(arguments)
+      @arguments    = arguments
+      self.command  = arguments[0]
+      self.filename = arguments[1]
+    end
+
+    attr_writer :git_url, :filename, :file, :command
+  end
+end

data/lib/trout/managed_file.rb

@@ -0,0 +1,124 @@
+require 'fileutils'
+require 'trout/version_list'
+
+module Trout
+  class ManagedFile
+    attr_reader :filename, :checked_out_url
+
+    def initialize(filename)
+      @filename = filename
+    end
+
+    def copy_from(git_url)
+      checkout(git_url)
+      copy_to_destination
+      write_url_and_version
+    ensure
+      cleanup
+    end
+
+    def update
+      checkout(previous_git_url)
+      merge_to_destination
+    ensure
+      cleanup
+    end
+
+    private
+
+    def checkout(git_url)
+      run_or_fail("git clone #{git_url} #{working('git')}")
+      @checked_out_url = git_url
+    end
+
+    def copy_to_destination
+      FileUtils.cp(working('git', filename), filename)
+    end
+
+    def merge_to_destination
+      upstream       = working('upstream')
+      at_last_update = working('at_last_update')
+      merge          = working('merge')
+
+      FileUtils.cp(working('git', filename), upstream)
+
+      checkout_last_version
+      FileUtils.cp(working('git', filename), at_last_update)
+
+      enforce_newline(upstream)
+      enforce_newline(at_last_update)
+      enforce_newline(filename)
+
+      run("diff3 -mX #{filename} #{at_last_update} #{upstream} > #{merge}")
+      FileUtils.mv(merge, filename)
+    ensure
+      FileUtils.rm_rf(upstream)
+      FileUtils.rm_rf(at_last_update)
+    end
+
+    def cleanup
+      FileUtils.rm_rf(working('git'))
+      @checked_out_url = nil
+    end
+
+    def prepare_working_directory
+      FileUtils.mkdir(working_root)
+    end
+
+    def working_root
+      '.trout'
+    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 HEAD")
+    end
+
+    def checkout_last_version
+      git_command("checkout #{previous_git_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 version_list
+      @version_list ||= VersionList.new(working('versions'))
+    end
+
+    def working(*paths)
+      File.join(working_root, *paths)
+    end
+
+    def enforce_newline(path)
+      if IO.read(path)[-1].chr != "\n"
+        File.open(path, "a") { |file| file.puts }
+      end
+    end
+
+    def run(command)
+      `#{command} 2>&1`
+    end
+
+    def run_or_fail(command)
+      output = run(command)
+      unless $? == 0
+        raise "Command failed with status #{$?}:\n#{command}\n#{output}"
+      end
+      output
+    end
+  end
+end

data/lib/trout/version_list.rb

@@ -0,0 +1,44 @@
+require 'yaml'
+
+module Trout
+  class VersionList
+    attr_reader :path, :entries
+
+    def initialize(path)
+      @path = path
+    end
+
+    def git_url_for(filename)
+      read
+      entries[filename]['git_url']
+    end
+
+    def version_for(filename)
+      read
+      entries[filename]['version']
+    end
+
+    def update(filename, info)
+      read
+      entries[filename] ||= {}
+      entries[filename].update(info)
+      write
+    end
+
+    private
+
+    def read
+      if File.exist?(path)
+        @entries = YAML.load(IO.read(path))
+      else
+        @entries = {}
+      end
+    end
+
+    def write
+      File.open(path, 'w') do |file|
+        file.write(YAML.dump(entries))
+      end
+    end
+  end
+end

metadata

@@ -0,0 +1,109 @@
+--- !ruby/object:Gem::Specification 
+name: trout
+version: !ruby/object:Gem::Version 
+  hash: 9
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  version: "0.1"
+platform: ruby
+authors: 
+- Joe Ferris
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-09-10 00:00:00 -04:00
+default_executable: trout
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  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
+        file with several other repositories. This means that you can update your
+        Gemfile in the master repository, and then get the latest of all the
+        common gems that you use in each project just by running "trout update
+        Gemfile".
+email: jferris@thoughtbot.com
+executables: 
+- trout
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- LICENSE
+- Rakefile
+- README.textile
+- lib/trout/cli.rb
+- lib/trout/managed_file.rb
+- lib/trout/version_list.rb
+- lib/trout.rb
+- features/support/env.rb
+- features/sync_gemfile.feature
+- bin/trout
+has_rdoc: true
+homepage: http://github.com/jferris/trout
+licenses: []
+
+post_install_message: 
+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.7
+signing_key: 
+specification_version: 3
+summary: So your common files can swim upstream.
+test_files: 
+- features/support/env.rb
+- features/sync_gemfile.feature