zitgit 0.0.2 → 0.1.0

data/views/commits/labels.slim

@@ -1,9 +1,9 @@
 - heads(commit).each do |head|
-  .ref_label.branch_label
-    = head.name
+  .ref_label.branch_label data-dropdown-name="branches"
+    a href="ref/#{URI::encode(head.name, '/')}" = head.name
 - remotes(commit).each do |head|
-  .ref_label.remote_label
-    = head.name
+  .ref_label.remote_label data-dropdown-name="remotes"
+    a href="ref/#{URI::encode(head.name, '/')}" = head.name
 - tags(commit).each do |head|
-  .ref_label.tag_label
-    = head.name
+  .ref_label.tag_label data-dropdown-name="tags"
+    a href="ref/#{URI::encode(head.name, '/')}" = head.name

data/views/commits/list.slim

@@ -1,7 +1,7 @@
 table.large-12.commits-table
     thead
       tr
-        th.badges SHA
+        th.badges Info
         th.author Author
         th.message Message
     tbody
@@ -9,14 +9,15 @@ table.large-12.commits-table
         tr class=('selected' if i==0)
           td.badges
             == slim :'commits/labels', :locals => {commit: commit}, :layout => false
-            .sha
-              = commit.sha
+            .sha = commit.sha
+            .date = commit.date.strftime("%d.%m.%Y %H:%M")
           td.author
             =' commit.author.name
             = commit.author.email
           td.hidden
             == slim :'commits/detail', :locals => {commit: commit}, :layout => false
           td.message
-            = commit.message
+            div
+              = commit.message
 
 

data/views/diffs/image.slim

@@ -0,0 +1,11 @@
+- diff.diff.lines.each do |line|
+  - if line.match /^\-\-\- a/
+    .diff-first-line.diff-a
+      = line
+  - elsif line.match /^\+\+\+ b/
+    .diff-first-line.diff-b
+      = line
+- if diff.a_blob
+  img src="data:#{diff.a_blob.mime_type};base64,#{Base64.encode64(diff.a_blob.data)}"
+- if diff.b_blob
+  img src="data:#{diff.b_blob.mime_type};base64,#{Base64.encode64(diff.b_blob.data)}"

data/views/diffs/large.slim

@@ -0,0 +1,12 @@
+- diff.diff.lines.each do |line|
+  - if line.match /^\-\-\- a/
+    .diff-first-line.diff-a
+      = line
+  - elsif line.match /^\+\+\+ b/
+    .diff-first-line.diff-b
+      = line
+  - elsif line.match /^\+\+\+ \/dev\/null/ or line.match /^\-\-\- \/dev\/null/
+  - elsif line.match /^@@ -/
+    .diff-summ-line
+      = summ_line(line)
+    - break

data/views/diffs/line.slim

@@ -0,0 +1,5 @@
+- if line.match(/(\s+)\n$/)
+  = line.rstrip
+  span.trailing = Regexp.last_match(1)
+- else
+  = line

data/views/diffs/list.slim

@@ -1,4 +1,9 @@
 ul.diff-names
+  - if diffs.count > 1
+    li.all.selected All files
+  -else
+    li.all.selected.hidden All files
+
   - diffs.each do |diff|
     li
       - if diff.deleted_file
@@ -16,24 +21,28 @@ ul.diff-names
 ul.diffs
   - diffs.each do |diff|
     li
-      - diff.diff.lines.each do |line|
-        - if line.match /^\-\-\- a/
-          .diff-first-line.diff-a
-            = line
-        - elsif line.match /^\+\+\+ b/
-          .diff-first-line.diff-b
-            = line
-        - elsif line.match /^@@ -/
-          .diff-summ-line
-            = line
-        - elsif line[0] == '+'
-          .diff-added-line
-            = line
-        - elsif line[0] == '-'
-          .diff-removed-line
-            = line
-        - else
-          .diff-line
-            = line
-
-
+      - if is_image(diff)
+        == slim :'diffs/image', :locals => {diff: diff}, :layout => false
+      - elsif large_diff?(diff)
+        == slim :'diffs/large', :locals => {diff: diff}, :layout => false
+      - else
+        - diff.diff.lines.each do |line|
+          - if line.match /^\-\-\- a/
+            .diff-first-line.diff-a
+              = line
+          - elsif line.match /^\+\+\+ b/
+            .diff-first-line.diff-b
+              = line
+          - elsif line.match /^\+\+\+ \/dev\/null/ or line.match /^\-\-\- \/dev\/null/
+          - elsif line.match /^@@ -/
+            .diff-summ-line
+              = summ_line(line)
+          - elsif line[0] == '+'
+            .diff-added-line
+              == slim(:'diffs/line', :locals => {line: line}, :layout => false).force_encoding('utf-8')
+          - elsif line[0] == '-'
+            .diff-removed-line
+              == slim(:'diffs/line', :locals => {line: line}, :layout => false).force_encoding('utf-8')
+          - else
+            .diff-line
+              == slim(:'diffs/line', :locals => {line: line}, :layout => false).force_encoding('utf-8')

data/views/index.slim

@@ -28,9 +28,14 @@ nav.top-bar
         a.active.current_branch
         ul.dropdown.tags
           == slim :'refs/dropdown', :locals => {refs: @tags}, :layout => false
+    ul.right
+      li
+        a.refresh href="/"
+          img src="images/refresh.png"
 .loader
-.main.row
+.main
   .history.large-6.columns
+    == slim :'status/list', :locals => {repo: @repo}, :layout => false
     == slim :'commits/list', :locals => {commits: @commits}, :layout => false
   .show_commit.large-6.columns
     == slim :'commits/detail', :locals => {commit: @last_commit}, :layout => false

data/views/layout.slim

@@ -1,6 +1,7 @@
 html
   head
     link rel="stylesheet" href="css/app.css"
+    title ="Zitgit - #{ @repo_name }"
   body
     == yield
     script type="text/javascript" src="js/jquery.js"

data/views/refs/dropdown.slim

@@ -1,3 +1,4 @@
 - refs.each do |ref|
   li
-    a href="ref/#{URI::encode(ref.name, '/')}" = ref.name
+    - unless is_head_ref(ref)
+      a href="ref/#{URI::encode(ref.name, '/')}" = ref.name

data/views/status/added.slim

@@ -0,0 +1,10 @@
+.diff-first-line.diff-b
+  |+++ b/
+  = item.path
+.diff-summ-line
+  |1 -> 1-
+  = item.blob.content.lines.count
+- item.blob.content.lines.each do |line|
+  .diff-added-line
+    == slim(:'diffs/line', :locals => {line: '+'+line}, :layout => false).force_encoding('utf-8')
+

data/views/status/changed.slim

@@ -0,0 +1,21 @@
+- item.diff_string.lines.each do |line|
+  - if line.match /^\-\-\- a/
+    .diff-first-line.diff-a
+      = line
+  - elsif line.match /^\+\+\+ b/
+    .diff-first-line.diff-b
+      = line
+  - elsif line.match /^\+\+\+ \/dev\/null/ or line.match /^\-\-\- \/dev\/null/
+  - elsif line.match /^@@ -/
+    .diff-summ-line
+      = summ_line(line)
+  - elsif line[0] == '+'
+    .diff-added-line
+      == slim(:'diffs/line', :locals => {line: line}, :layout => false).force_encoding('utf-8')
+  - elsif line[0] == '-'
+    .diff-removed-line
+      == slim(:'diffs/line', :locals => {line: line}, :layout => false).force_encoding('utf-8')
+  - else
+    .diff-line
+      == slim(:'diffs/line', :locals => {line: line}, :layout => false).force_encoding('utf-8')
+

data/views/status/deleted.slim

@@ -0,0 +1,9 @@
+.diff-first-line.diff-b
+  |--- a/
+  = item.path
+.diff-summ-line
+  = "1-#{item.blob.content.lines.count} -> 1"
+- item.blob.content.lines.each do |line|
+  .diff-removed-line
+    == slim(:'diffs/line', :locals => {line: '-'+line}, :layout => false).force_encoding('utf-8')
+

data/views/status/list.slim

@@ -0,0 +1,30 @@
+.status
+  a.status-link Stage
+  .status_content
+    .commit
+      h4 Stage
+      ul.diff-names
+        li.all.selected All files
+        - @repo.status.added.each do |file|
+          li
+            a.new_file = file[1].path
+        - @repo.status.changed.each do |file|
+          - if not file[1].sha_index.match(/^0+$/)
+            li
+              a.changed = file[1].path
+        - @repo.status.deleted.each do |file|
+          - if file[1].stage.nil?
+            li
+              a.deleted = file[1].path
+      ul.diffs
+        - @repo.status.added.each do |file|
+          li
+            == slim(:'status/added', :locals => {item: file[1]}, :layout => false)
+        - @repo.status.changed.each do |file|
+          - if not file[1].sha_index.match(/^0+$/)
+            li
+              == slim(:'status/changed', :locals => {item: file[1]}, :layout => false)
+        - @repo.status.deleted.each do |file|
+          - if file[1].stage.nil?
+            li
+              == slim(:'status/deleted', :locals => {item: file[1]}, :layout => false)

data/zitgit.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'sinatra', "~> 1.4"
   spec.add_dependency 'slim', "~> 1.3"
+  spec.add_dependency 'gitlab-grit', "~> 2.5.1"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zitgit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: gitlab-grit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -171,11 +187,15 @@ files:
 - README.md
 - Rakefile
 - bin/zitgit
+- lib/grit/status.rb
 - lib/zitgit.rb
+- lib/zitgit/helpers/git.rb
+- lib/zitgit/helpers/views.rb
 - lib/zitgit/version.rb
 - public/coffee/application.coffee
 - public/css/app.css
 - public/images/loader.gif
+- public/images/refresh.png
 - public/js/application.js
 - public/js/jquery.js
 - public/js/jquery.nicescroll.js
@@ -222,10 +242,17 @@ files:
 - views/commits/detail.slim
 - views/commits/labels.slim
 - views/commits/list.slim
+- views/diffs/image.slim
+- views/diffs/large.slim
+- views/diffs/line.slim
 - views/diffs/list.slim
 - views/index.slim
 - views/layout.slim
 - views/refs/dropdown.slim
+- views/status/added.slim
+- views/status/changed.slim
+- views/status/deleted.slim
+- views/status/list.slim
 - zitgit.gemspec
 homepage: ''
 licenses:
@@ -248,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Git repository viewer