water 0.6.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmE0MDQ1M2JmNWQ2ZjlkYTQ5YWY2NWZmYTgyNGI3NzdmMmVkODk4MA==
+  data.tar.gz: !binary |-
+    ZTY3NzZlZGJmNjQwN2U1ODFlMDc4MTBkMTFkMjA4MjRjOWJjMjU3Yg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OWVkMTdhZDMzY2ZmN2ZiNjY5NWEyMWUwYzk1ZDM0ZWMxMjM1MzZlNWQ1OTNl
+    M2QwODE3OTlhMTg2NGI3MjdmZmFiMmY0ODY5MzZlYWUwOTRjODY1ODMxYmFm
+    MDA4YmZlOGJiMTQwYWQ2YjQ4ZDM3YjYwZWE0NWEyNDUxOTI0YzA=
+  data.tar.gz: !binary |-
+    ZTE2NTg1N2NiYmI4M2M5ODBiMjc0MDhlNmQzYWUzODdhOGViODE1OWRiNGRk
+    MmE1MDFkOWQyODlkMmFiODg4M2YyMDJhM2E4NDg2NzM2ZGE5OTkzZTg3YTE1
+    ODAzN2FmYjk2ZWI1MDE0N2E2MzU5MjUzNTdhMTdkODFiNjAxNzU=

data/Rakefile

@@ -5,5 +5,5 @@ task :default => :test
 
 desc 'Run a quick test'
 task :test do
-  puts `git diff | ruby -rubygems -w -Ilib bin/water`
+  puts %x(git diff `git rev-list HEAD | tail -n 1` | ruby -rubygems -w -Ilib bin/water)
 end

data/assets/water.css

@@ -0,0 +1,50 @@
+body {
+  background: gray;
+  padding-bottom: 1000px;
+}
+body > a {
+  display: block;
+  position: fixed;
+  top: 0;
+  right: 0;
+  background: gray;
+  color: white;
+  padding: 5px 10px;
+  font-family: monospace;
+  font-weight: bold;
+  text-decoration: none;
+}
+body > a:hover {
+  text-decoration: underline;
+}
+
+.diff-block {
+  background: hsl(0,0%,95%);
+  margin: 5px;
+  margin-bottom: 0;
+  padding: 3px 6px;
+  overflow-y: visible;
+  overflow-x: auto;
+  -webkit-transition: 0.3s;
+     -moz-transition: 0.3s;
+          transition: 0.3s;
+}
+.diff-block.closed {
+  margin-top: -5px;
+  overflow: hidden;
+}
+.diff-block:first-of-type.closed {
+  margin-top: 0;
+}
+
+.CodeRay pre {
+  width: -moz-fit-content;
+  line-height: 15px;
+}
+.CodeRay .line {
+  float: none;
+  height: 15px;
+}
+.diff-block-content .CodeRay .line {
+  margin-bottom: -15px;
+}

data/lib/water.rb

@@ -5,7 +5,9 @@ require 'coderay'
 require 'launchy'
 
 class Water
-  DIFF_DIR_NAME  = Pathname.new('~/.water').expand_path
+  DIFF_DIR_NAME = Pathname.new('~/.water').expand_path
+  
+  CSS = File.read(File.expand_path('../../assets/water.css', __FILE__))
   
   def self.run
     new.run
@@ -44,7 +46,7 @@ class Water
   end
   
   def water diff
-    output = diff.gsub(/\r\n?/, "\n").scan(/ (?> ^(?!-(?!--)|\+(?!\+\+)|[\\ ]|$|@@) .*\n)* (?> ^(?=-(?!--)|\+(?!\+\+)|[\\ ]|$|@@) .*(?:\n|\z))+ /x).map do |block|
+    output = diff.gsub(/\r\n?/, "\n").scan(/ (?> ^(?!-(?!--\ )|\+(?!\+\+)|[\\ ]|$|@@) .*\n)* (?> ^(?=-(?!--\ )|\+(?!\+\+)|[\\ ]|$|@@) .*(?:\n|\z))+ /x).map do |block|
       head_ray, content_ray = CodeRay.scanner(:diff).tokenize(block.split("\n", 2))
       content_ray ||= ''
       
@@ -58,80 +60,27 @@ class Water
     
     output.extend(CodeRay::Encoders::HTML::Output)
     output.css = CodeRay::Encoders::HTML::CSS.new(:alpha)
-    
-    output.css.stylesheet << <<-CSS
-    
-body {
-  background: gray;
-  padding-bottom: 1000px;
-}
-body > a {
-  display: block;
-  position: fixed;
-  top: 0;
-  right: 0;
-  background: gray;
-  color: white;
-  padding: 5px 10px;
-  font-family: monospace;
-  font-weight: bold;
-  text-decoration: none;
-}
-body > a:hover {
-  text-decoration: underline;
-}
-
-.diff-block {
-  background: hsl(0,0%,95%);
-  margin: 5px;
-  margin-bottom: 0;
-  padding: 3px 6px;
-  overflow-y: visible;
-  overflow-x: auto;
-  -webkit-transition: 0.3s;
-     -moz-transition: 0.3s;
-          transition: 0.3s;
-}
-.diff-block.closed {
-  margin-top: -5px;
-  overflow: hidden;
-}
-.diff-block:first-of-type.closed {
-  margin-top: 0;
-}
-
-.CodeRay pre {
-  width: -moz-fit-content;
-  line-height: 15px;
-}
-.CodeRay .line {
-  float: none;
-  height: 15px;
-}
-.diff-block-content .CodeRay .line {
-  margin-bottom: -15px;
-}
-    CSS
+    output.css.stylesheet << Water::CSS
     
     output.wrap_in! CodeRay::Encoders::HTML::Output.page_template_for_css(output.css)
     output.apply_title! "diff #{Dir.pwd} | water"
     
     output[/<\/head>\s*<body[^>]*>?/] = <<-JS
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
     <script>
       $(function () {
-        $('.diff-block').live('click', function () {
+        $(document).on('click', '.diff-block', function () {
           $(this).toggleClass('closed').find('.diff-block-content').slideToggle('fast');
           $('html, body').animate({ scrollTop: $(this).offset().top }, 'fast');
         });
-        $('.diff-block').live('touchend', function () {
+        $(document).on('touchend', '.diff-block', function () {
           $(this).toggleClass('closed').find('.diff-block-content').slideToggle('fast');
           $('html, body').animate({ scrollTop: $(this).offset().top }, 'fast');
         });
-        $('a.toggle-all').click(function () {
+        $(document).on('click', 'a.toggle-all', function () {
           $('.diff-block').toggleClass('closed').find('.diff-block-content').toggle();
         });
-      })
+      });
     </script>
     </head>
     

data/readme.textile

@@ -1,14 +1,28 @@
 h1. Water
 
-Water takes a unified diff as its input and opens a browser window with a nicely formatted display of it. It uses CodeRay to highlight the code inside of the diff.
+Water takes a unified diff and opens it in your browser – nicely formatted.
+
+p=. !http://cl.ly/Cdh8!
+
+h2. Features
+
+* syntax colors (CodeRay)
+* highlighting of in-line changes ("eye-catchers")
+* toggle files with a click
 
 h2. Usage
- 
-bc. [git|svn|...] diff | water
+
+bc.             git diff | water
+
+bc. svn diff -rPREV:HEAD | water
+
+bc.             diff -wu | water
+
+p. …et cetera.
 
 h2. Installation
 
 bc. gem install water
 
-This will install a pre-release version of CodeRay (for syntax highlighting),
-and launchy (along with its dependencies) to cross-platform browser opening.
+This will install a latest version of CodeRay,
+and launchy (along with its dependencies) for cross-platform browser opening.

data/water.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "water"
-  s.version     = '0.6.0'
+  s.version     = '0.7.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Kornelius Kalnbach"]
   s.email       = ["murphy@rubychan.de"]
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.summary     = "diff viewer with code highlighting"
   s.description = "The diff washing machine. See your code changes clearly."
   
-  s.add_dependency "coderay", '~> 1.0.0'
+  s.add_dependency "coderay", '~> 1.0.7'
   s.add_dependency "launchy", '~> 2.0.0'
   
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,38 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: water
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Kornelius Kalnbach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70345625837780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70345625837780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70345625836900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70345625836900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: The diff washing machine. See your code changes clearly.
 email:
 - murphy@rubychan.de
@@ -46,32 +51,32 @@ files:
 - Gemfile
 - LICENSE.txt
 - Rakefile
+- assets/water.css
 - bin/water
 - lib/water.rb
 - readme.textile
 - water.gemspec
 homepage: http://water.rubychan.de
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: diff viewer with code highlighting
 test_files: []