minecraft-merge 0.1.0

data/.document

@@ -0,0 +1,5 @@
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -0,0 +1,14 @@
+source "http://rubygems.org"
+# Add dependencies required to use your gem here.
+# Example:
+#   gem "activesupport", ">= 2.3.5"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "rspec", "~> 2.3.0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.5.2"
+  gem "rcov", ">= 0"
+  gem "nbtfile", ">= 0.2.0"
+end

data/LICENSE.txt

@@ -0,0 +1,20 @@
+Copyright (c) 2011 MenTaLguY  <mental@rydia.net>
+
+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.rdoc

@@ -0,0 +1,19 @@
+= minecraft-merge
+
+Description goes here.
+
+== Contributing to minecraft-merge
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+== Copyright
+
+Copyright (c) 2011 MenTaLguY. See LICENSE.txt for
+further details.
+

data/Rakefile

@@ -0,0 +1,51 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "minecraft-merge"
+  gem.homepage = "http://github.com/mental/minecraft-merge"
+  gem.license = "MIT"
+  gem.summary = %Q{A git merge driver for minecraft worlds}
+  gem.description = %Q{A git merge driver for minecraft worlds}
+  gem.email = "mental@rydia.net"
+  gem.authors = ["MenTaLguY"]
+  # Include your dependencies below. Runtime dependencies are required when using your gem,
+  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
+  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
+  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+  gem.add_runtime_dependency 'nbtfile', '>= 0.2.0'
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "minecraft-merge #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.1.0

data/bin/minecraft-merge

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'minecraft-merge'
+
+exit(MinecraftMerge.main(*ARGV))

data/lib/minecraft-merge.rb

@@ -0,0 +1,153 @@
+# minecraft-merge
+#
+# Copyright (c) 2011 MenTaLguY  <mental@rydia.net>
+#
+# 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.
+
+require 'optparse'
+require 'fileutils'
+require 'nbtfile'
+require 'stringio'
+require 'zlib'
+
+module MinecraftMerge
+
+module Main
+  extend self
+
+GZIP_MAGIC = "\x1f\x8b"
+
+def main(*args)
+  parser = OptionParser.new do |opts|
+  end
+  parser.banner = "Usage: #{parser.program_name} merge ORIG OURS THEIRS\n" +
+                  "       #{parser.program_name} setup [REPOSITORY]\n"
+  parser.parse!(args)
+
+  if args.empty?
+    parser.warn("No subcommand given")
+    return 1
+  end
+  subcommand = args.shift
+
+  case subcommand
+  when 'merge'
+    if args.length != 3
+      parser.warn("Wrong number of arguments for merge (3 required)")
+      return 1
+    end
+    do_merge(*args)
+
+  when 'install'
+    if args.length > 0
+      parser.warn("Wrong number of arguments for install (0 needed)")
+      return 1
+    end
+
+    unless system "git", "config", "--global", "merge.minecraft.name", "Minecraft merge driver" and
+           system "git", "config", "--global", "merge.minecraft.driver", "minecraft-merge merge %O %A %B" and
+           system "git", "config", "--global", "filter.minecraft.clean", "minecraft-merge decompress" and
+           system "git", "config", "--global", "filter.minecraft.smudge", "minecraft-merge compress"
+      return 1
+    end
+
+  when 'setup'
+    if args.length > 1
+      parser.warn("Wrong number of arguments for setup (1 optional)")
+      return 1
+    end
+
+    work_dir = args[0] || Dir.pwd
+    Dir.chdir work_dir
+
+    File.open(".gitignore", "w+") do |s|
+      s.puts "session.lock"
+      s.puts "level.dat_old"
+    end
+
+    File.open(".gitattributes", "w+") do |s|
+      s.puts "*.dat binary -delta merge=minecraft"
+    end
+
+    unless system "git", "add", ".gitignore", ".gitattributes" and
+           system "git", "commit", "-m", "set up attributes"
+      return 1
+    end
+
+  when 'compress'
+    data = $stdin.read
+    if data[0, GZIP_MAGIC.length] == GZIP_MAGIC
+      $stdout.write data
+      $stdout.flush
+    else
+      writer = Zlib::GzipWriter.new($stdout)
+      writer.write data
+      writer.close
+    end
+
+  when 'decompress'
+    data = $stdin.read
+    if data[0, GZIP_MAGIC.length] == GZIP_MAGIC
+      reader = Zlib::GzipReader.new(StringIO.new(data))
+      $stdout.write reader.read
+      reader.close
+      $stdout.flush
+    else
+      $stdout.write data
+      $stdout.flush
+    end
+
+  else
+    parser.warn("Unknown subcommand #{subcommand}")
+    return 1
+  end
+  return 0
+end
+
+def do_merge(orig, ours, theirs)
+  dats = [orig, ours, theirs].map { |filename|
+    if File.stat(filename).size.nonzero?
+      File.open(filename, 'rb') { |s| NBTFile.read(s) }
+    else
+      ["", NBTFile::Types::Compound.new]
+    end
+  }
+
+  orig_data, our_data, their_data = dats.map { |(label, root)|
+    chunk_data = root["Level"] || {}
+    {'Blocks' => chunk_data["Blocks"]}
+  }
+
+  ours_changed = our_data != orig_data
+  theirs_changed = their_data != orig_data
+
+  # do a stupid merge for now; keep our stuff in case of a conflict
+  if theirs_changed and not ours_changed
+    FileUtils.cp(theirs, ours)
+  end
+end
+
+end
+
+def self.main(*args)
+  Main.main(*args)
+end
+
+end

data/spec/minecraft-merge_spec.rb

@@ -0,0 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'minecraft-merge'
+
+describe "MinecraftMerge" do
+  it "exists" do
+    MinecraftMerge
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'minecraft-merge'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  
+end

metadata

@@ -0,0 +1,172 @@
+--- !ruby/object:Gem::Specification 
+name: minecraft-merge
+version: !ruby/object:Gem::Version 
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
+platform: ruby
+authors: 
+- MenTaLguY
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2011-02-15 00:00:00 -08:00
+default_executable: minecraft-merge
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
+        version: 2.3.0
+  requirement: *id001
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: bundler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  requirement: *id002
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: jeweler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
+        version: 1.5.2
+  requirement: *id003
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rcov
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: nbtfile
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  requirement: *id005
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: nbtfile
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  requirement: *id006
+  type: :runtime
+description: A git merge driver for minecraft worlds
+email: mental@rydia.net
+executables: 
+- minecraft-merge
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE.txt
+- README.rdoc
+files: 
+- .document
+- .rspec
+- Gemfile
+- LICENSE.txt
+- README.rdoc
+- Rakefile
+- VERSION
+- bin/minecraft-merge
+- lib/minecraft-merge.rb
+- spec/minecraft-merge_spec.rb
+- spec/spec_helper.rb
+has_rdoc: true
+homepage: http://github.com/mental/minecraft-merge
+licenses: 
+- MIT
+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: A git merge driver for minecraft worlds
+test_files: 
+- spec/minecraft-merge_spec.rb
+- spec/spec_helper.rb