redcar 0.6.1 → 0.7

data/plugins/runnables/lib/runnables/tree_mirror/nodes/runnable_type_group.rb

@@ -0,0 +1,32 @@
+module Redcar
+  class Runnables
+    class RunnableTypeGroup
+      include Redcar::Tree::Mirror::NodeMirror
+
+      def initialize(name,path,runnables)
+        @name = name
+        if runnables.any?
+          @children = runnables.map do |runnable|
+            Runnable.new(runnable["name"],path,runnable)
+          end
+        end
+      end
+
+      def leaf?
+        false
+      end
+
+      def text
+        @name
+      end
+
+      def icon
+        File.join(Redcar::ICONS_DIRECTORY, "folder-open-small-gears.png")
+      end
+
+      def children
+        @children
+      end
+    end
+  end
+end

data/plugins/runnables/lib/runnables/tree_mirror/tree_controller.rb

@@ -0,0 +1,41 @@
+module Redcar
+  class Runnables
+    class TreeController
+      include Redcar::Tree::Controller
+
+      def initialize(project)
+        @project = project
+      end
+
+      def right_click(tree, node)
+        controller = self
+        menu = Menu.new
+        Redcar.plugin_manager.objects_implementing(:runnables_context_menus).each do |object|
+          case object.method(:runnables_context_menus).arity
+          when 1
+            menu.merge(object.runnables_context_menus(node))
+          when 2
+            menu.merge(object.runnables_context_menus(tree, node))
+          when 3
+            menu.merge(object.runnables_context_menus(tree, node, controller))
+          else
+            puts("Invalid runnables_context_menus hook detected in "+object.class.name)
+          end
+        end
+        Application::Dialog.popup_menu(menu, :pointer)
+      end
+
+      def activated(tree, node)
+        case node
+        when Runnable
+          Runnables.run_process(@project.home_dir, node.command, node.text, node.output)
+        when HelpItem
+          tab = Redcar.app.focussed_window.new_tab(HtmlTab)
+          tab.go_to_location("http://wiki.github.com/danlucraft/redcar/users-guide-runnables")
+          tab.title = "Runnables Help"
+          tab.focus
+        end
+      end
+    end
+  end
+end

data/plugins/runnables/lib/runnables/tree_mirror/tree_mirror.rb

@@ -0,0 +1,61 @@
+module Redcar
+  class Runnables
+    class TreeMirror
+      include Redcar::Tree::Mirror
+
+      attr_accessor :last_loaded
+
+      def initialize(project)
+        @project = project
+      end
+
+      def runnable_file_paths
+        @project.config_files("runnables/*.json")
+      end
+
+      def last_updated
+        runnable_file_paths.map{ |p| File.mtime(p) }.max
+      end
+
+      def changed?
+        !last_loaded || last_loaded < last_updated
+      end
+
+      def custom_command
+        custom_info = {}
+        custom_info["command"] = PARAMS
+        custom_info["output"] = 'tab'
+        custom = Runnable.new("Custom Command",@project.path,custom_info)
+        [custom]
+      end
+
+      def load
+        groups = {}
+        runnable_file_paths.each do |path|
+          runnables = []
+          name = File.basename(path,".json")
+          json = File.read(path)
+          this_runnables = JSON(json)["commands"]
+          runnables += this_runnables || []
+          groups[name.to_s] = runnables.to_a
+        end
+
+        if groups.any?
+          groups.map do |name, runnables|
+            RunnableGroup.new(name,@project.path,runnables)
+          end
+        else
+          [HelpItem.new]
+        end
+      end
+
+      def title
+        TREE_TITLE
+      end
+
+      def top
+        custom_command + load
+      end
+    end
+  end
+end

data/plugins/scm/lib/scm.rb

@@ -21,15 +21,15 @@ require 'scm/scm_commits_mirror/commit'
 module Redcar
   module Scm
     ICONS_DIR = File.expand_path(File.join(File.dirname(__FILE__), %w{.. icons}))
-    
+
     class Manager
       extend Redcar::HasSPI
-      
+
       def self.sensitivities
         [
           Sensitivity.new(:open_commit_tab, Redcar.app, false, [:tab_focussed]) do |tab|
-            tab and 
-            tab.is_a?(EditTab) and 
+            tab and
+            tab.is_a?(EditTab) and
             tab.edit_view.document.mirror.is_a?(Scm::CommitMirror)
           end,
           Sensitivity.new(:open_scm, Redcar.app, false, [:window_focussed]) do |window|
@@ -43,20 +43,24 @@ module Redcar
         osx = Keymap.build("main", :osx) do
           link "Cmd+Shift+C", Scm::CommitMirror::SaveCommand
         end
-        
+
         linwin = Keymap.build("main", [:linux, :windows]) do
           link "Ctrl+Shift+C", Scm::CommitMirror::SaveCommand
         end
-        
+
         [linwin, osx]
       end
-      
+
       def self.menus
         Menu::Builder.build do
           sub_menu "Project" do
             group(:priority => 10) do
               separator
               sub_menu "Source Control" do
+                Scm::Manager.modules_with_remote_init.sort {|a, b| a.repository_type <=> b.repository_type}.each do |m|
+                  item m.translations[:remote_init], :command => Scm::RemoteInitCommand, :value => m
+                end
+                separator
                 item "Toggle Changes Tree", :command => Scm::ToggleScmTreeCommand, :value => [:commit, [Scm::ScmChangesMirror, Scm::ScmChangesController]]
                 item "Toggle Commits Tree", :command => Scm::ToggleScmTreeCommand, :value => [:push, [Scm::ScmCommitsMirror, Scm::ScmCommitsController]]
                 separator
@@ -67,36 +71,36 @@ module Redcar
           end
         end
       end
-      
+
       def self.project_repositories
         @project_repositories ||= {}
       end
-      
+
       # should we print debugging messages? this can get pretty verbose
       def self.debug
         ARGV.include?('--debug')
       end
-      
+
       def self.modules
         @modules ||= begin
           mods = []
           puts "Loading Redcar SCM modules..." if debug
-          
+
           Redcar.plugin_manager.objects_implementing(:scm_module).each do |i|
             puts "  Found #{i.name}." if debug
             object = i.scm_module
-            
+
             if object.supported?
               mods.push(object)
             elsif debug
               puts "    but discarding because it isn't supported on the current system."
             end
           end
-          
+
           mods
         end
       end
-      
+
       # Returns a list of instances of SCM modules. This list has already been
       # filtered for invalid modules.
       def self.modules_instance
@@ -112,36 +116,40 @@ module Redcar
           end
         }.find_all {|m| not m.nil?}
       end
-      
+
       def self.modules_with_init
         modules_instance.find_all {|m| m.supported_commands.include? :init}
       end
-      
+
+      def self.modules_with_remote_init
+        modules_instance.find_all {|m| m.supported_commands.include? :remote_init}
+      end
+
       def self.project_loaded(project)
         # for now we only want to attempt to handle the local case
         return if project.remote?
-        
+
         puts "#{modules.count} SCM modules loaded." if debug
-        
+
         repo = modules_instance.find do |m|
           puts "Checking if #{project.path} is a #{m.repository_type} repository..." if debug
           m.repository?(project.path)
         end
-        
+
         # quit if we can't find something to handle this project
         return if repo.nil?
-        
+
         puts "  Yes it is!" if debug
-        
+
         prepare(project, repo)
       end
-      
+
       def self.prepare(project, repo)
         start = Time.now
         begin
           # associate this repository with a project internally
           project_repositories[project] = {'repo' => repo}
-          
+
           # load the repository and inject adapter if there is one
           repo.load(project.path)
           adapter = repo.adapter(project.adapter)
@@ -149,34 +157,34 @@ module Redcar
             puts "Attaching a custom adapter to the project." if debug
             project.adapter = adapter
           end
-          
+
           project_repositories[project]['trees'] = []
         rescue
           # cleanup
           info = project_repositories.delete project
-          
+
           puts "*** Error loading SCM: " + $!.message
           puts $!.backtrace
         end
-        
+
         puts "scm start took #{Time.now - start}s (included in project start time)" if debug
       end
-      
+
       def self.project_closed(project)
         # disassociate this project with any repositories
         info = project_repositories.delete project
         return if info.nil?
-        
+
         info['trees'].each {|t| project.window.treebook.remove_tree(t)}
       end
-      
+
       def self.refresh_trees
         project_repositories.each do |project, info|
           project.refresh
           info['trees'].each {|t| t.refresh}
         end
       end
-      
+
       def self.project_context_menus(tree, node, controller)
         # Search for the current project
         project = Project::Manager.in_window(Redcar.app.focussed_window)
@@ -185,7 +193,7 @@ module Redcar
         end
         repo_info = project_repositories[project]
         init_modules = Redcar::Scm::Manager.modules_with_init
-        
+
         Menu::Builder.build do
           if not project.nil?
             if repo_info.nil? and init_modules.length > 0
@@ -194,27 +202,52 @@ module Redcar
                 separator
                 sub_menu "Create Repository From Project" do
                   init_modules.sort {|a, b| a.repository_type <=> b.repository_type}.each do |m|
-                    item(m.translations[:init]) do 
+                    item(m.translations[:init]) do
                       m.init!(project.path)
                       project.refresh
-                        
+
                       Redcar::Scm::Manager.prepare(project, m)
-                      
+
                       Application::Dialog.message_box("Created a new " + m.repository_type.capitalize + " repository in the root of your project.")
                     end
                   end
                 end
               end
             elsif repo_info
-              # TODO: display repository commands for this node here too
-              # Before that, need to work out a way of caching
-              # Scm#uncommited_changes as this will almost always be an
-              # expensive operation.
               group :priority => 40 do
                 repo = repo_info['repo']
-                if repo.supported_commands.find {|i| [:switch_branch].include? i}
+                if repo.supported_commands.find {|i| [:switch_branch, :pull, :pull_targetted].include? i}
                   separator
                 end
+                if repo.supported_commands.include?(:pull)
+                  item (repo.translations[:pull]) do
+                    repo.pull!
+
+                    # refresh tree views
+                    project.refresh
+                    repo_info['trees'].each {|t| t.refresh}
+                  end
+                end
+                if repo.supported_commands.include?(:pull_targetted)
+                  lazy_sub_menu repo.translations[:pull_targetted] do
+                    repo.pull_targets.sort.each do |target|
+                      action = lambda do
+                        begin
+                          repo.pull!(target)
+
+                          # refresh tree views
+                          project.refresh
+                          repo_info['trees'].each {|t| t.refresh}
+                        rescue
+                          Redcar::Application::Dialog.message_box($!.message)
+                          puts $!.backtrace
+                        end
+                      end
+
+                      item target, &action
+                    end
+                  end
+                end
                 if repo.supported_commands.include?(:switch_branch)
                   lazy_sub_menu repo.translations[:switch_branch] do
                     current = repo.current_branch
@@ -222,7 +255,7 @@ module Redcar
                       action = lambda {
                         begin
                           repo.switch!(branch)
-                          
+
                           # refresh tree views
                           project.refresh
                           repo_info['trees'].each {|t| t.refresh}
@@ -231,7 +264,7 @@ module Redcar
                           puts $!.backtrace
                         end
                       }
-                      
+
                       item branch, :type => :radio, :active => (branch == current), &action
                     end
                   end
@@ -241,18 +274,18 @@ module Redcar
           end
         end
       end
-      
+
       def self.open_commit_tab(repo, change=nil)
         tab = Redcar.app.focussed_window.new_tab(Redcar::EditTab)
-        edit_view = tab.edit_view  
+        edit_view = tab.edit_view
         mirror = Scm::CommitMirror.new(repo, change)
         edit_view.document.mirror = mirror
         edit_view.grammar = "Diff"
         tab.focus
-        
+
         mirror.add_listener(:change) do
           tab.close
-          
+
           project = Project::Manager.focussed_project
           repo_info = project_repositories[project]
           repo_info['trees'].each {|t| t.refresh}

data/plugins/scm/lib/scm/commands.rb

@@ -3,21 +3,21 @@ module Redcar
   module Scm
     class ToggleScmTreeCommand < Command
       sensitize :open_scm
-      
+
       def execute(options)
         raise "ToggleScmTree requires a class value." if not options[:value]
-        
+
         command = options[:value][0]
         klass = options[:value][1]
         project = Project::Manager.focussed_project
         info = Scm::Manager.project_repositories[project]
         tree = info['trees'].find {|t| t.tree_mirror.is_a?(klass[0])}
-        
+
         if tree
           info['trees'].delete tree
           focussed = project.window.treebook.focussed_tree == tree
           project.window.treebook.remove_tree(tree)
-          
+
           # return focus to the project module if we were currently focussed
           project.window.treebook.focus_tree(project.tree) if focussed
         elsif info['repo'].supported_commands.include? command
@@ -30,5 +30,19 @@ module Redcar
         end
       end
     end
+
+    class RemoteInitCommand < Command
+      def execute(options)
+        raise "No scm module given for remote init" unless options[:value]
+        m = options[:value]
+        dialog = Redcar::ApplicationSWT::Dialogs::TextAndFileDialog.new(Redcar.app.focussed_window.controller.shell)
+        dialog.set_text(m.translations[:remote_init],m.translations[:remote_init_path],m.translations[:remote_init_target])
+        result = dialog.open
+        if result
+          Redcar::Project::Manager.open_project_for_path(result[:directory])
+          m.remote_init(result[:text].to_s,result[:directory].to_s)
+        end
+      end
+    end
   end
 end