royw-git_shoes 0.0.0 → 0.0.1

data/Rakefile

@@ -20,6 +20,7 @@ require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.spec_opts = ["--color", "--format nested"]
 end
 
 Spec::Rake::SpecTask.new(:rcov) do |spec|

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
-:major: 0
 :minor: 0
+:patch: 1
+:major: 0

data/lib/controllers/controller.rb

@@ -18,6 +18,10 @@ class Controller
   REVERSE_DATE = 'Oldest First'
   SORT_NAMES = [NAME, REVERSE_NAME, DATE, REVERSE_DATE]
 
+  class << self
+    attr_accessor :selected_item
+  end
+
   # current working directory
   def self.cwd
     Directory.cwd
@@ -74,7 +78,7 @@ class Controller
   def self.files(&blk)
     items = Directory.contents.collect do |item|
       item.options[:click] = lambda {Controller.chdir(item.path); blk.call(nil)} if item.directory?
-      item.options[:click] = lambda {blk.call(item.path)} if item.file?
+      item.options[:click] = lambda {blk.call(item)} if item.file?
       item
     end
 #     puts "files items => #{items.inspect}"

data/lib/loader.rb

@@ -5,15 +5,18 @@ require 'logger'
 require 'singleton'
 # require 'ruby-debug'
 
-require 'logger_facade'
-
-require 'models/git_helper'
-require 'models/directory'
-require 'models/dir_item'
-
+# a few classes have to be loaded before the rest
+require 'views/nav'
 require 'views/bullet_list'
+require 'views/widget'
 require 'views/action'
-require 'views/dir_action'
 
-require 'controllers/controller'
+# require all *.rb files under lib
+Dir.glob("lib/**/*.rb").select{|f| f =~ /^lib\//}.each do |filespec|
+  file = filespec.gsub(/\.rb$/, '').gsub(/^lib\//, '')
+  unless file == 'loader'
+#     puts "require #{file}"
+    require file
+  end
+end
 

data/lib/views/action.rb

@@ -3,8 +3,27 @@ class Action
 
   attr_accessor :app
 
+  def initialize
+    @command_widget = CommandWidget.new
+    @title_widget = TitleWidget.new
+    @page_widget = PageWidget.new
+  end
+
   def execute(obj=nil)
 
   end
 
+  def page_layout(&blk)
+    @page_widget.app = app
+    @page_widget.show
+
+    app.flow(:width => '100%') do
+      @title_widget.app = app
+      @title_widget.show
+      @command_widget.app = app
+      @command_widget.show(:width => 100)
+      blk.call unless blk.nil?
+    end
+  end
+
 end

data/lib/views/command_widget.rb

@@ -0,0 +1,49 @@
+class CommandWidget < Widget
+  include Nav
+
+  def show(opt={})
+    dir_item = Controller.selected_item
+    app.stack(opt) do
+      app.background app.gradient(app.rgb(0, 255, 0), app.rgb(255, 255, 0), :angle => -35)
+      app.para app.link("Files",  :click => lambda{app.visit(DIR_PAGE)})
+      app.rect(5, 30, 90, 1)
+      if Controller.in_repository?
+        app.para app.link("Status", :click => lambda{app.visit(STATUS_PAGE)})
+        if !dir_item.nil? && (dir_item.modified? || dir_item.candidate?)
+          app.para app.link("Add", :click => lambda{add_action})
+        else
+          app.para "Add"
+        end
+        if !dir_item.nil? && dir_item.modified?
+          app.para app.link("Diff", :click => lambda{diff_action})
+        else
+          app.para "Diff"
+        end
+        app.para app.link("Commit", :click => lambda{commit_action})
+        app.para "Config"
+      else
+#         app.para 'Status'
+#         app.para "Diff"
+#         app.para "Commit"
+#         app.para "Branch"
+#         app.para "Config"
+      end
+    end
+  end
+
+  def add_action
+    # TODO implement
+    puts "need to implement add_action"
+  end
+
+  def diff_action
+    # TODO implement
+    puts "need to implement diff_action"
+  end
+
+  def commit_action
+    # TODO implement
+    puts "need to implement commit_action"
+  end
+
+end

data/lib/views/dir_action.rb

@@ -1,217 +1,19 @@
 class DirAction < Action
-  include BulletList
-
-  DIR_PAGE = '/'
-  FILE_PAGE = '/file'
-  VIEW_AREA_OPTS = {:width => -100, :margin_left => 10, :margin_right => @gutter}
+  include Nav
 
   def initialize
     super
-    @filter_selection = Controller::FILTER_NAMES.first
-    @sort_selection   = Controller::SORT_NAMES.first
+    @directory_widget = DirectoryWidget.new
   end
 
+  def execute()
+    info "dir_action.execute"
 
-  def execute(filename=nil)
-    info "dir_action.execute(#{filename})"
-    dir_item = @values.select{|item| item.path == filename}.first rescue nil
-    @gutter = app.gutter
-    app.background app.palegreen
-    app.style(Shoes::Link, :underline => false, :stroke => app.blue)
-    app.style(Shoes::LinkHover, :underline => true, :stroke => app.red)
-
-    app.flow(:width => '100%') do
-      title_stack = app.stack(:width => '100%') do
-        app.background app.gradient(app.rgb(0, 255, 0), app.rgb(225, 255, 0), :angle => 135)
-        app.title("Git Shoes", :align => 'center')
-      end
-      command_widget(dir_item, :width => 100)
-      if dir_item.nil?
-        @view_area = directory_widget(VIEW_AREA_OPTS)
-      else
-        @view_area = file_widget(dir_item, VIEW_AREA_OPTS)
-      end
-    end
-  end
-
-  def command_widget(dir_item, opt={})
-    app.stack(opt) do
-      app.background app.gradient(app.rgb(0, 255, 0), app.rgb(255, 255, 0), :angle => -35)
-      app.para app.link("Files",  :click => lambda{app.visit(DIR_PAGE)})
-      app.rect(5, 30, 90, 1)
-      if Controller.in_repository?
-        app.para app.link("Status", :click => lambda{status_action})
-        if !dir_item.nil? && (dir_item.modified? || dir_item.candidate?)
-          app.para app.link("Add", :click => lambda{add_action})
-        else
-          app.para "Add"
-        end
-        if !dir_item.nil? && dir_item.modified?
-          app.para app.link("Diff", :click => lambda{diff_action})
-        else
-          app.para "Diff"
-        end
-        app.para app.link("Commit", :click => lambda{commit_action})
-        app.para "Config"
-      else
-#         app.para 'Status'
-#         app.para "Diff"
-#         app.para "Commit"
-#         app.para "Branch"
-#         app.para "Config"
-      end
+    page_layout do
+      Controller.selected_item = nil
+      @directory_widget.app = app
+      @view_area = @directory_widget.show(VIEW_AREA_OPTS)
     end
   end
 
-  def add_action
-    # TODO implement
-    puts "need to implement add_action"
-  end
-
-  def diff_action
-    # TODO implement
-    puts "need to implement diff_action"
-  end
-
-  def commit_action
-    # TODO implement
-    puts "need to implement commit_action"
-  end
-
-  def status_action
-    if Controller.in_repository?
-      @view_area.clear {status_widget(VIEW_AREA_OPTS)}
-    end
-  end
-
-  def status_widget(opt={})
-    app.stack(opt) do
-      app.para `git status`
-      app.info app.para.text
-    end
-  end
-
-  def file_widget(dir_item, opt={})
-    app.stack(opt) do
-      app.para "filename: #{dir_item.path}"
-      # TODO: everything there is to know about the file ;)
-      app.para(app.strong('Log'))
-      app.flow(:height => 200, :margin_right => @gutter, :scroll => true) do
-        app.background app.turquoise
-        app.para(dir_item.log)
-      end
-      if dir_item.modified?
-        app.para
-        app.para(app.strong('Diff'))
-        app.flow(:height => 200, :margin_right => @gutter, :scroll => true) do
-          app.background app.turquoise
-          app.para dir_item.diff
-        end
-      end
-    end
-  end
-
-  def directory_widget(opt={})
-    app.stack(opt) do
-      cwd = Controller.cwd
-      git_project_dir = Controller.git_project_dir
-      if git_project_dir.nil?
-        app.caption("Directory", :align => 'center')
-        app.para(cwd)
-      else
-        repository_widget(cwd, git_project_dir)
-      end
-
-      file_selection(git_project_dir)
-    end
-  end
-
-  def repository_widget(cwd, git_project_dir)
-    app.caption("Git Repository", :align => 'center')
-    app.flow do
-      app.para "Branch: "
-      @branch_listbox = app.list_box(:items => Controller.branches) do |list|
-        Controller.branch = list.text
-        file_selection_changed
-      end
-      @branch_listbox.choose(Controller.branch(false))
-      app.button("New",       :margin_left => 10)  # TODO Hook it up
-      app.button("Delete",    :margin_left => 10)  # TODO Hook it up
-      app.button("Stash",     :margin_left => 10) { Controller.stash }
-      app.button("Stash Pop", :margin_left => 10) { Controller.stash_pop }
-    end
-    app.para("Branch: ", app.strong(Controller.branch(true)))
-    app.para(app.strong(git_project_dir, app.em(cwd.gsub(git_project_dir, ''))))
-    buf = []
-    repository_info = Controller.repository_info
-    repository_info.each do |key, value|
-      buf << "#{value} #{key} files"
-    end
-    app.para buf.join(", ")
-  end
-
-  def file_selection(git_project_dir)
-    app.flow do
-      app.para 'Filter by: '
-      if git_project_dir.nil?
-        filter_items = Controller::FILTER_NAMES
-        unless filter_items.include?(@filter_selection)
-          @filter_selection = filter_items.first
-        end
-      else
-        filter_items = Controller::GIT_FILTER_NAMES
-      end
-      @filter_by = app.list_box(:items => filter_items) do |list|
-        file_selection_changed
-      end
-      app.para '   Sort by: '
-      @sort_by = app.list_box(:items => Controller::SORT_NAMES) do |list|
-        file_selection_changed
-      end
-      @listing = app.stack
-      @filter_by.choose(@filter_selection)
-      @sort_by.choose(@sort_selection)
-
-      # need to fire a selection changed to get the intial loading of @listing
-      file_selection_changed
-    end
-  end
-
-  def file_selection_changed
-    @filter_selection = @filter_by.text
-    @sort_selection = @sort_by.text
-    @values = Controller.files do |filename|
-      if filename.nil?
-        app.visit(DIR_PAGE)
-      else
-        app.visit(FILE_PAGE + '/' + filename)
-      end
-    end
-    @values = Controller.filter_by(@filter_by.text, @values)
-    @values = Controller.sort_by(@sort_by.text, @values)
-    @listing.clear {bullet_list(@values, :bullet => fs_bullets)}
-  end
-
-  def fs_bullets
-    lambda do |item|
-      if item.path == '..'
-        bullet = BulletList::SPACE_BULLET
-      else
-        if item.directory?
-          app.fill app.black
-          bullet = BulletList::PLUS_BULLET
-        else
-          if item.modified?
-            app.fill app.red
-          elsif item.managed?
-            app.fill app.lime
-          else
-            app.fill app.black
-          end
-          bullet = BulletList::CIRCLE_BULLET
-        end
-      end
-      bullet
-    end
-  end
 end

data/lib/views/directory_widget.rb

@@ -0,0 +1,94 @@
+class DirectoryWidget < Widget
+  include BulletList
+  include Nav
+
+  def initialize
+    @filter_selection = Controller::FILTER_NAMES.first
+    @sort_selection   = Controller::SORT_NAMES.first
+    @repository_widget = RepositoryWidget.new
+  end
+
+  def show(opt={})
+    app.stack(opt) do
+      cwd = Controller.cwd
+      git_project_dir = Controller.git_project_dir
+      if git_project_dir.nil?
+        app.caption("Directory", :align => 'center')
+        app.para(cwd)
+      else
+        @repository_widget.app = app
+        @repository_widget.show(cwd, git_project_dir)
+      end
+
+      file_selection(git_project_dir)
+    end
+  end
+
+  def file_selection(git_project_dir)
+    app.flow do
+      app.para 'Filter by: '
+      if git_project_dir.nil?
+        filter_items = Controller::FILTER_NAMES
+        unless filter_items.include?(@filter_selection)
+          @filter_selection = filter_items.first
+        end
+      else
+        filter_items = Controller::GIT_FILTER_NAMES
+      end
+      @filter_by = app.list_box(:items => filter_items) do |list|
+        file_selection_changed
+      end
+      app.para '   Sort by: '
+      @sort_by = app.list_box(:items => Controller::SORT_NAMES) do |list|
+        file_selection_changed
+      end
+      @listing = app.stack
+      @filter_by.choose(@filter_selection)
+      @sort_by.choose(@sort_selection)
+
+      # need to fire a selection changed to get the intial loading of @listing
+      file_selection_changed
+    end
+  end
+
+  def file_selection_changed
+    @filter_selection = @filter_by.text
+    @sort_selection = @sort_by.text
+    @values = Controller.files do |item|
+      if item.nil? || item.directory?
+        Controller.selected_item = nil
+        app.visit(DIR_PAGE)
+      else
+        Controller.selected_item = item
+        app.visit(FILE_PAGE)
+      end
+    end
+    @values = Controller.filter_by(@filter_by.text, @values)
+    @values = Controller.sort_by(@sort_by.text, @values)
+    @listing.clear {bullet_list(@values, :bullet => fs_bullets)}
+  end
+
+  def fs_bullets
+    lambda do |item|
+      if item.path == '..'
+        bullet = BulletList::SPACE_BULLET
+      else
+        if item.directory?
+          app.fill app.black
+          bullet = BulletList::PLUS_BULLET
+        else
+          if item.modified?
+            app.fill app.red
+          elsif item.managed?
+            app.fill app.lime
+          else
+            app.fill app.black
+          end
+          bullet = BulletList::CIRCLE_BULLET
+        end
+      end
+      bullet
+    end
+  end
+
+end

data/lib/views/file_action.rb

@@ -0,0 +1,19 @@
+class FileAction < Action
+  include BulletList
+  include Nav
+
+  def initialize
+    super
+    @file_widget = FileWidget.new
+  end
+
+  def execute()
+    info "file_action.execute"
+
+    page_layout do
+      @file_widget.app = app
+      @view_area = @file_widget.show(VIEW_AREA_OPTS)
+    end
+  end
+
+end

data/lib/views/file_widget.rb

@@ -0,0 +1,26 @@
+class FileWidget < Widget
+
+  def show(opt={})
+    dir_item = Controller.selected_item
+    app.stack(opt) do
+      unless dir_item.nil?
+        app.para "filename: #{dir_item.path}"
+        # TODO: everything there is to know about the file ;)
+        if dir_item.modified?
+          app.para(app.strong('Diff'))
+          app.flow(:height => 200, :margin_right => @gutter, :scroll => true) do
+            app.background app.turquoise
+            app.para dir_item.diff
+          end
+          app.para
+        end
+        app.para(app.strong('Log'))
+        app.flow(:height => 200, :margin_right => @gutter, :scroll => true) do
+          app.background app.turquoise
+          app.para(dir_item.log)
+        end
+      end
+    end
+  end
+
+end

data/lib/views/nav.rb

@@ -0,0 +1,8 @@
+module Nav
+  INDEX_PAGE = '/'
+  DIR_PAGE = '/'
+  FILE_PAGE = '/file'
+  STATUS_PAGE = '/status'
+
+  VIEW_AREA_OPTS = {:width => -100, :margin_left => 10, :margin_right => @gutter}
+end

data/lib/views/page_widget.rb

@@ -0,0 +1,10 @@
+class PageWidget < Widget
+
+  def show(opt={})
+    @gutter = app.gutter
+    app.background app.palegreen
+    app.style(Shoes::Link, :underline => false, :stroke => app.blue)
+    app.style(Shoes::LinkHover, :underline => true, :stroke => app.red)
+  end
+
+end

data/lib/views/repository_widget.rb

@@ -0,0 +1,28 @@
+class RepositoryWidget < Widget
+
+  def show(cwd, git_project_dir)
+    app.caption("Git Repository", :align => 'center')
+    app.flow do
+      app.para "Branch: "
+      @branch_listbox = app.list_box(:items => Controller.branches) do |list|
+        Controller.branch = list.text
+        app.visit(DIR_PAGE)
+#         file_selection_changed
+      end
+      @branch_listbox.choose(Controller.branch(false))
+      app.button("New",       :margin_left => 10)  # TODO Hook it up
+      app.button("Delete",    :margin_left => 10)  # TODO Hook it up
+      app.button("Stash",     :margin_left => 10) { Controller.stash }
+      app.button("Stash Pop", :margin_left => 10) { Controller.stash_pop }
+    end
+    app.para("Branch: ", app.strong(Controller.branch(true)))
+    app.para(app.strong(git_project_dir, app.em(cwd.gsub(git_project_dir, ''))))
+    buf = []
+    repository_info = Controller.repository_info
+    repository_info.each do |key, value|
+      buf << "#{value} #{key} files"
+    end
+    app.para buf.join(", ")
+  end
+
+end

data/lib/views/status_action.rb

@@ -0,0 +1,22 @@
+class StatusAction < Action
+  include BulletList
+  include Nav
+
+  def initialize
+    super
+    @status_widget = StatusWidget.new
+  end
+
+  def execute()
+    info "status_action.execute"
+
+    page_layout do
+      if Controller.in_repository?
+        info "in repository"
+        @status_widget.app = app
+        @view_area = @status_widget.show(VIEW_AREA_OPTS)
+      end
+    end
+  end
+
+end

data/lib/views/status_widget.rb

@@ -0,0 +1,11 @@
+class StatusWidget < Widget
+
+  def show(opt={})
+    info "StatusWidget.show"
+    app.stack(opt) do
+      app.para `git status`
+      app.info app.para.text
+    end
+  end
+
+end

data/lib/views/title_widget.rb

@@ -0,0 +1,10 @@
+class TitleWidget < Widget
+
+  def show
+    title_stack = app.stack(:width => '100%') do
+      app.background app.gradient(app.rgb(0, 255, 0), app.rgb(225, 255, 0), :angle => 135)
+      app.title("Git Shoes", :align => 'center')
+    end
+  end
+
+end

data/lib/views/widget.rb

@@ -0,0 +1,5 @@
+class Widget
+
+  attr_accessor :app
+
+end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'spec'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'git_shoes'
+require 'loader'
 
 Spec::Runner.configure do |config|
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: royw-git_shoes
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Roy Wright
@@ -35,7 +35,18 @@ files:
 - lib/models/git_helper.rb
 - lib/views/action.rb
 - lib/views/bullet_list.rb
+- lib/views/command_widget.rb
 - lib/views/dir_action.rb
+- lib/views/directory_widget.rb
+- lib/views/file_action.rb
+- lib/views/file_widget.rb
+- lib/views/nav.rb
+- lib/views/page_widget.rb
+- lib/views/repository_widget.rb
+- lib/views/status_action.rb
+- lib/views/status_widget.rb
+- lib/views/title_widget.rb
+- lib/views/widget.rb
 - spec/git_helper_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true