buildr-iidea 0.0.9 → 0.0.10

data/lib/buildr/intellij_idea/idea_project.rb

@@ -1,105 +1,105 @@
-module Buildr
-  module IntellijIdea
-    class IdeaProject < IdeaFile
-      attr_accessor :vcs
-      attr_accessor :extra_modules
-      attr_writer :jdk_version
-
-      def initialize(buildr_project)
-        @buildr_project = buildr_project
-        @vcs = detect_vcs
-        @extra_modules = []
-      end
-
-      def jdk_version
-        @jdk_version ||= buildr_project.compile.options.source || "1.6"
-      end
-      
-      protected
-
-      def extension
-        "ipr"
-      end
-
-      def detect_vcs
-        if File.directory?(buildr_project._('.svn'))
-          "svn"
-        elsif File.directory?(buildr_project._('.git'))
-          "Git"
-        end
-      end
-
-      def base_document
-        target = StringIO.new
-        Builder::XmlMarkup.new(:target => target).project(:version => "4", :relativePaths => "false")
-        REXML::Document.new(target.string)
-      end
-
-      def default_components
-        [
-            lambda { modules_component },
-            vcs_component
-        ]
-      end
-
-      def initial_components
-        [
-            lambda { project_root_manager_component },
-            lambda { project_details_component }
-        ]
-      end
-
-      def project_root_manager_component
-        attribs = {"version" => "2",
-                   "assert-keyword" => "true",
-                   "jdk-15" => "true",
-                   "project-jdk-name" => self.jdk_version,
-                   "project-jdk-type" => "JavaSDK",
-                   "languageLevel" => "JDK_#{self.jdk_version.gsub('.','_')}" }
-        create_component("ProjectRootManager",attribs) do |xml|
-          xml.output("url" => "file://$PROJECT_DIR$/out")
-        end
-      end
-
-      def project_details_component
-        create_component("ProjectDetails") do |xml|
-          xml.option("name" => "projectName", "value" => self.name )
-        end
-      end
-
-      def modules_component
-        create_component("ProjectModuleManager") do |xml|
-          xml.modules do
-            buildr_project.projects.select { |subp| subp.iml? }.each do |subproject|
-              module_path = subproject.base_dir.gsub(/^#{buildr_project.base_dir}\//, '')
-              path = "#{module_path}/#{subproject.iml.name}.iml"
-              attribs = { :fileurl => "file://$PROJECT_DIR$/#{path}", :filepath => "$PROJECT_DIR$/#{path}" }
-              if subproject.iml.group == true
-                attribs[:group] = subproject.parent.name.gsub(':', '/')
-              elsif !subproject.iml.group.nil?
-                attribs[:group] = subproject.group.to_s
-              end
-              xml.module attribs
-            end
-            self.extra_modules.each do |iml_file|
-              xml.module :fileurl => "file://$PROJECT_DIR$/#{iml_file}",
-                         :filepath => "$PROJECT_DIR$/#{iml_file}"
-            end
-            if buildr_project.iml?
-              xml.module :fileurl => "file://$PROJECT_DIR$/#{buildr_project.iml.name}.iml",
-                         :filepath => "$PROJECT_DIR$/#{buildr_project.iml.name}.iml"
-            end
-          end
-        end
-      end
-
-      def vcs_component
-        if vcs
-          create_component("VcsDirectoryMappings") do |xml|
-            xml.mapping :directory => "", :vcs => vcs
-          end
-        end
-      end
-    end
-  end
-end
+module Buildr
+  module IntellijIdea
+    class IdeaProject < IdeaFile
+      attr_accessor :vcs
+      attr_accessor :extra_modules
+      attr_writer :jdk_version
+
+      def initialize(buildr_project)
+        @buildr_project = buildr_project
+        @vcs = detect_vcs
+        @extra_modules = []
+      end
+
+      def jdk_version
+        @jdk_version ||= buildr_project.compile.options.source || "1.6"
+      end
+      
+      protected
+
+      def extension
+        "ipr"
+      end
+
+      def detect_vcs
+        if File.directory?(buildr_project._('.svn'))
+          "svn"
+        elsif File.directory?(buildr_project._('.git'))
+          "Git"
+        end
+      end
+
+      def base_document
+        target = StringIO.new
+        Builder::XmlMarkup.new(:target => target).project(:version => "4", :relativePaths => "false")
+        REXML::Document.new(target.string)
+      end
+
+      def default_components
+        [
+            lambda { modules_component },
+            vcs_component
+        ]
+      end
+
+      def initial_components
+        [
+            lambda { project_root_manager_component },
+            lambda { project_details_component }
+        ]
+      end
+
+      def project_root_manager_component
+        attribs = {"version" => "2",
+                   "assert-keyword" => "true",
+                   "jdk-15" => "true",
+                   "project-jdk-name" => self.jdk_version,
+                   "project-jdk-type" => "JavaSDK",
+                   "languageLevel" => "JDK_#{self.jdk_version.gsub('.','_')}" }
+        create_component("ProjectRootManager",attribs) do |xml|
+          xml.output("url" => "file://$PROJECT_DIR$/out")
+        end
+      end
+
+      def project_details_component
+        create_component("ProjectDetails") do |xml|
+          xml.option("name" => "projectName", "value" => self.name )
+        end
+      end
+
+      def modules_component
+        create_component("ProjectModuleManager") do |xml|
+          xml.modules do
+            buildr_project.projects.select { |subp| subp.iml? }.each do |subproject|
+              module_path = subproject.base_dir.gsub(/^#{buildr_project.base_dir}\//, '')
+              path = "#{module_path}/#{subproject.iml.name}.iml"
+              attribs = { :fileurl => "file://$PROJECT_DIR$/#{path}", :filepath => "$PROJECT_DIR$/#{path}" }
+              if subproject.iml.group == true
+                attribs[:group] = subproject.parent.name.gsub(':', '/')
+              elsif !subproject.iml.group.nil?
+                attribs[:group] = subproject.group.to_s
+              end
+              xml.module attribs
+            end
+            self.extra_modules.each do |iml_file|
+              xml.module :fileurl => "file://$PROJECT_DIR$/#{iml_file}",
+                         :filepath => "$PROJECT_DIR$/#{iml_file}"
+            end
+            if buildr_project.iml?
+              xml.module :fileurl => "file://$PROJECT_DIR$/#{buildr_project.iml.name}.iml",
+                         :filepath => "$PROJECT_DIR$/#{buildr_project.iml.name}.iml"
+            end
+          end
+        end
+      end
+
+      def vcs_component
+        if vcs
+          create_component("VcsDirectoryMappings") do |xml|
+            xml.mapping :directory => "", :vcs => vcs
+          end
+        end
+      end
+    end
+  end
+end

data/lib/buildr/intellij_idea/project_extension.rb

@@ -1,108 +1,108 @@
-require 'stringio'
-
-module Buildr
-  module IntellijIdea
-    module ProjectExtension
-
-      include Extension
-
-      first_time do
-        desc "Generate Intellij IDEA artifacts for all projects"
-        Project.local_task "iidea:generate" => "artifacts"
-
-        desc "Delete the generated Intellij IDEA artifacts"
-        Project.local_task "iidea:clean"
-        
-        # Remove the old idea tasks if they exist. Either could depending on the names
-        # selected for the IDEA project files by iidea extension and thus have been removed.
-        task_list = Rake.application.instance_variable_get('@tasks')
-        task_list.delete("idea")
-        task_list.delete("idea7x")
-        task_list.delete("idea7x:clean")
-      end
-
-      before_define do |project|
-        project.recursive_task("iidea:generate")
-        project.recursive_task("iidea:clean")
-      end
-
-      after_define do |project|
-        iidea = project.task("iidea:generate")
-
-        files = [
-            (project.iml if project.iml?),
-            (project.ipr if project.ipr?)
-        ].compact
-
-        files.each do |ideafile|
-          module_dir =  File.dirname(ideafile.filename)         
-          # Need to clear the actions else the extension included as part of buildr will run
-          file(ideafile.filename).clear_actions
-          directory(module_dir)
-          iidea.enhance [ file(ideafile.filename) ]
-          file(ideafile.filename => [Buildr.application.buildfile, module_dir]) do |task|
-            info "Writing #{task.name}"
-            t = Tempfile.open("buildr-iidea")
-            temp_filename = t.path
-            t.close!
-            File.open(temp_filename, "w") do |f|
-              ideafile.write f
-            end
-            mv temp_filename, ideafile.filename
-          end
-        end
-
-        project.task("iidea:clean") do
-          files.each do |f|
-            info "Removing #{f.filename}" if File.exist?(f.filename)
-            rm_rf f.filename
-          end
-        end
-      end
-
-      def ipr
-        if ipr?
-          @ipr ||= IdeaProject.new(self)
-        else
-          raise "Only the root project has an IPR"
-        end
-      end
-
-      def ipr?
-        !@no_ipr && self.parent.nil?
-      end
-
-      def iml
-        if iml?
-          unless @iml
-            inheritable_iml_source = self.parent
-            while inheritable_iml_source && !inheritable_iml_source.iml?
-              inheritable_iml_source = inheritable_iml_source.parent;
-            end
-            @iml = inheritable_iml_source ? inheritable_iml_source.iml.clone : IdeaModule.new
-            @iml.buildr_project = self
-          end
-          return @iml
-        else
-          raise "IML generation is disabled for #{self.name}"
-        end
-      end
-
-      def no_ipr
-        @no_ipr = true
-      end
-
-      def no_iml
-        @has_iml = false
-      end
-
-      def iml?
-        @has_iml = @has_iml.nil? ? true : @has_iml
-      end
-    end
-  end
-end
-
-class Buildr::Project
-  include Buildr::IntellijIdea::ProjectExtension
-end
+require 'stringio'
+
+module Buildr
+  module IntellijIdea
+    module ProjectExtension
+
+      include Extension
+
+      first_time do
+        desc "Generate Intellij IDEA artifacts for all projects"
+        Project.local_task "iidea:generate" => "artifacts"
+
+        desc "Delete the generated Intellij IDEA artifacts"
+        Project.local_task "iidea:clean"
+        
+        # Remove the old idea tasks if they exist. Either could depending on the names
+        # selected for the IDEA project files by iidea extension and thus have been removed.
+        task_list = Rake.application.instance_variable_get('@tasks')
+        task_list.delete("idea")
+        task_list.delete("idea7x")
+        task_list.delete("idea7x:clean")
+      end
+
+      before_define do |project|
+        project.recursive_task("iidea:generate")
+        project.recursive_task("iidea:clean")
+      end
+
+      after_define do |project|
+        iidea = project.task("iidea:generate")
+
+        files = [
+            (project.iml if project.iml?),
+            (project.ipr if project.ipr?)
+        ].compact
+
+        files.each do |ideafile|
+          module_dir =  File.dirname(ideafile.filename)         
+          # Need to clear the actions else the extension included as part of buildr will run
+          file(ideafile.filename).clear_actions
+          directory(module_dir)
+          iidea.enhance [ file(ideafile.filename) ]
+          file(ideafile.filename => [Buildr.application.buildfile, module_dir]) do |task|
+            info "Writing #{task.name}"
+            t = Tempfile.open("buildr-iidea")
+            temp_filename = t.path
+            t.close!
+            File.open(temp_filename, "w") do |f|
+              ideafile.write f
+            end
+            mv temp_filename, ideafile.filename
+          end
+        end
+
+        project.task("iidea:clean") do
+          files.each do |f|
+            info "Removing #{f.filename}" if File.exist?(f.filename)
+            rm_rf f.filename
+          end
+        end
+      end
+
+      def ipr
+        if ipr?
+          @ipr ||= IdeaProject.new(self)
+        else
+          raise "Only the root project has an IPR"
+        end
+      end
+
+      def ipr?
+        !@no_ipr && self.parent.nil?
+      end
+
+      def iml
+        if iml?
+          unless @iml
+            inheritable_iml_source = self.parent
+            while inheritable_iml_source && !inheritable_iml_source.iml?
+              inheritable_iml_source = inheritable_iml_source.parent;
+            end
+            @iml = inheritable_iml_source ? inheritable_iml_source.iml.clone : IdeaModule.new
+            @iml.buildr_project = self
+          end
+          return @iml
+        else
+          raise "IML generation is disabled for #{self.name}"
+        end
+      end
+
+      def no_ipr
+        @no_ipr = true
+      end
+
+      def no_iml
+        @has_iml = false
+      end
+
+      def iml?
+        @has_iml = @has_iml.nil? ? true : @has_iml
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::IntellijIdea::ProjectExtension
+end

data/lib/buildr/intellij_idea/version.rb

@@ -1,11 +1,11 @@
-module Buildr
-  module IntellijIdea
-    class Version
-      MAJOR = "0"
-      MINOR = "0"
-      MICRO = "9"
-
-      STRING = "#{MAJOR}.#{MINOR}.#{MICRO}" 
-    end
-  end
+module Buildr
+  module IntellijIdea
+    class Version
+      MAJOR = "0"
+      MINOR = "0"
+      MICRO = "10"
+
+      STRING = "#{MAJOR}.#{MINOR}.#{MICRO}" 
+    end
+  end
 end

data/lib/buildr_iidea.rb

@@ -1,6 +1,6 @@
-require 'buildr'
-require 'buildr/intellij_idea/version'
-require 'buildr/intellij_idea/idea_file'
-require 'buildr/intellij_idea/idea_module'
-require 'buildr/intellij_idea/idea_project'
-require 'buildr/intellij_idea/project_extension'
+require 'buildr'
+require 'buildr/intellij_idea/version'
+require 'buildr/intellij_idea/idea_file'
+require 'buildr/intellij_idea/idea_module'
+require 'buildr/intellij_idea/idea_project'
+require 'buildr/intellij_idea/project_extension'