buildr-bnd 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.0.4 (July 5, 2010)
+* Changed: Separated code into separate files, moved project extension code into a separate module and moved
+  the code into a hierarchy matching the module hierarchy.
+* Added: Add class containing version information about the plugin.  
+
 0.0.3 (June 1, 2010)
 * Added: Buildr::Bnd.remote_repository method to get remote repository for bnd dependency.
 * Deprecated: Buildr::Bnd.remote_repositories method that returned an array of repositories for bnd dependency.

data/buildr-bnd.gemspec

@@ -1,6 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) + '/lib/buildr/bnd/version')
+
 Gem::Specification.new do |spec|
   spec.name           = 'buildr-bnd'
-  spec.version        = `git describe`.strip.split('-').first
+  spec.version        = Buildr::Bnd::Version::STRING
   spec.authors        = ['Peter Donald']
   spec.email          = ["peter@realityforge.org"]
   spec.homepage       = "http://github.com/realityforge/buildr-bnd"

data/lib/buildr/bnd/bundle_task.rb

@@ -0,0 +1,91 @@
+module Buildr
+  module Bnd
+    class BundleTask < Rake::FileTask
+      attr_reader :project
+
+      def [](key)
+        @params[key]
+      end
+
+      def []=(key, value)
+        @params[key] = value
+      end
+
+      def classpath_element(dependencies)
+        artifacts = self.class.to_artifacts([dependencies])
+        self.prerequisites << artifacts
+        artifacts.each do |dependency|
+          @classpath << dependency.to_s
+        end
+      end
+
+      def to_params
+        params = project.manifest.merge(@params).reject { |k, v| v.nil? }
+        params["-classpath"] ||= @classpath.collect(&:to_s).join(", ")
+        params['Bundle-SymbolicName'] ||= [project.group, project.name.gsub(':', '.')].join('.')
+        params['Bundle-Name'] ||= project.comment || project.name
+        params['Bundle-Description'] ||= project.comment
+        params['Bundle-Version'] ||= project.version
+        params['Import-Package'] ||= '*'
+        params['Export-Package'] ||= '*'
+
+        params
+      end
+
+      def project=(project)
+        @project = project
+        @classpath = [project.compile.target] + project.compile.dependencies
+      end
+
+      protected
+
+      # Convert objects to artifacts, where applicable
+      def self.to_artifacts(files)
+        files.flatten.inject([]) do |set, file|
+          case file
+            when ArtifactNamespace
+              set |= file.artifacts
+            when Symbol, Hash
+              set |= [Buildr.artifact(file)]
+            when /([^:]+:){2,4}/ # A spec as opposed to a file name.
+              set |= [Buildr.artifact(file)]
+            when Project
+              set |= Buildr.artifacts(file.packages)
+            when Rake::Task
+              set |= [file]
+            when Struct
+              set |= Buildr.artifacts(file.values)
+            else
+              # non-artifacts passed as-is; in particular, String paths are
+              # unmodified since Rake FileTasks don't use absolute paths
+              set |= [file]
+          end
+        end
+      end
+
+      def initialize(*args) #:nodoc:
+        super
+        @params = {}
+        enhance do
+          filename = self.name
+          # Generate BND file with same name as target jar but different extension
+          bnd_filename = filename.sub /(\.jar)?$/, '.bnd'
+
+          params = self.to_params
+          params["-output"] = filename
+          File.open(bnd_filename, 'w') do |f|
+            f.print params.collect { |k, v| "#{k}=#{v}" }.join("\n")
+          end
+
+          Buildr::Bnd.bnd_main( "build", "-noeclipse", bnd_filename )
+          begin
+            Buildr::Bnd.bnd_main( "print", "-verify", filename )
+          rescue => e
+            rm filename
+            raise e
+          end
+        end
+      end
+    end
+  end
+end

data/lib/buildr/bnd/main.rb

@@ -0,0 +1,26 @@
+module Buildr
+  module Bnd
+    class << self
+      # The specs for requirements
+      def requires
+        ["biz.aQute:bnd:jar:0.0.384"]
+      end
+
+      # Repositories containing the requirements
+      def remote_repositories
+        puts "Buildr::Bnd.remote_repositories is deprecated. Please use Buildr::Bnd.remote_repository instead." 
+        [remote_repository]
+      end
+
+      # Repositories containing the requirements
+      def remote_repository
+        "http://www.aQute.biz/repo"
+      end
+
+      def bnd_main(*args)
+        cp = Buildr.artifacts(self.requires).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
+        Java::Commands.java 'aQute.bnd.main.bnd', *(args + [{ :classpath => cp }])
+      end
+    end
+  end
+end

data/lib/buildr/bnd/project_extension.rb

@@ -0,0 +1,36 @@
+module Buildr
+  module Bnd
+    module ProjectExtension
+      include Extension
+
+      first_time do
+        desc "Does `bnd print` on the packaged bundle and stdouts the output for inspection"
+        Project.local_task("bnd:print")
+      end
+
+      def package_as_bundle(filename)
+        project.task('bnd:print' => [filename]) do |task|
+          Buildr::Bnd.bnd_main("print", filename)
+        end
+
+        dirname = File.dirname(filename)
+        directory(dirname)
+
+        # Add Buildr.application.buildfile so it will rebuild if we change settings
+        task = BundleTask.define_task(filename => [Buildr.application.buildfile, dirname])
+        task.project = self
+        # the last task is the task considered the packaging task
+        task
+      end
+
+      # Change the bundle package to .jar extension
+      def package_as_bundle_spec(spec)
+        spec.merge(:type => :jar)
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::Bnd::ProjectExtension
+end

data/lib/buildr/bnd/version.rb

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

data/lib/buildr_bnd.rb

@@ -1,147 +1,4 @@
-module Buildr
-  module Bnd
-    include Buildr::Extension
-
-    class << self
-
-      # The specs for requirements
-      def requires
-        ["biz.aQute:bnd:jar:0.0.384"]
-      end
-
-      # Repositories containing the requirements
-      def remote_repositories
-        puts "Buildr::Bnd.remote_repositories is deprecated. Please use Buildr::Bnd.remote_repository instead." 
-        [remote_repository]
-      end
-
-      # Repositories containing the requirements
-      def remote_repository
-        "http://www.aQute.biz/repo"
-      end
-
-      def bnd_main(*args)
-        cp = Buildr.artifacts(self.requires).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
-        Java::Commands.java 'aQute.bnd.main.bnd', *(args + [{ :classpath => cp }])
-      end
-
-    end
-
-    class BundleTask < Rake::FileTask
-      attr_reader :project
-
-      def [](key)
-        @params[key]
-      end
-
-      def []=(key, value)
-        @params[key] = value
-      end
-
-      def classpath_element(dependencies)
-        artifacts = self.class.to_artifacts([dependencies])
-        self.prerequisites << artifacts
-        artifacts.each do |dependency|
-          @classpath << dependency.to_s
-        end
-      end
-
-      def to_params
-        params = project.manifest.merge(@params).reject { |k, v| v.nil? }
-        params["-classpath"] ||= @classpath.collect(&:to_s).join(", ")
-        params['Bundle-SymbolicName'] ||= [project.group, project.name.gsub(':', '.')].join('.')
-        params['Bundle-Name'] ||= project.comment || project.name
-        params['Bundle-Description'] ||= project.comment
-        params['Bundle-Version'] ||= project.version
-        params['Import-Package'] ||= '*'
-        params['Export-Package'] ||= '*'
-
-        params
-      end
-
-      def project=(project)
-        @project = project
-        @classpath = [project.compile.target] + project.compile.dependencies
-      end
-
-      protected
-
-      # Convert objects to artifacts, where applicable
-      def self.to_artifacts(files)
-        files.flatten.inject([]) do |set, file|
-          case file
-            when ArtifactNamespace
-              set |= file.artifacts
-            when Symbol, Hash
-              set |= [Buildr.artifact(file)]
-            when /([^:]+:){2,4}/ # A spec as opposed to a file name.
-              set |= [Buildr.artifact(file)]
-            when Project
-              set |= Buildr.artifacts(file.packages)
-            when Rake::Task
-              set |= [file]
-            when Struct
-              set |= Buildr.artifacts(file.values)
-            else
-              # non-artifacts passed as-is; in particular, String paths are
-              # unmodified since Rake FileTasks don't use absolute paths
-              set |= [file]
-          end
-        end
-      end
-
-      def initialize(*args) #:nodoc:
-        super
-        @params = {}
-        enhance do
-          filename = self.name
-          # Generate BND file with same name as target jar but different extension
-          bnd_filename = filename.sub /(\.jar)?$/, '.bnd'
-
-          params = self.to_params
-          params["-output"] = filename
-          File.open(bnd_filename, 'w') do |f|
-            f.print params.collect { |k, v| "#{k}=#{v}" }.join("\n")
-          end
-
-          Bnd.bnd_main( "build", "-noeclipse", bnd_filename )
-          begin
-            Bnd.bnd_main( "print", "-verify", filename )
-          rescue => e
-            rm filename
-            raise e
-          end
-        end
-      end
-    end
-
-    def package_as_bundle(filename)
-      project.task('bnd:print' => [filename]) do |task|
-        Bnd.bnd_main( "print", filename )
-      end
-
-      dirname = File.dirname(filename)
-      directory( dirname )
-
-      # Add Buildr.application.buildfile so it will rebuild if we change settings
-      task = BundleTask.define_task(filename => [Buildr.application.buildfile, dirname])
-      task.project = self
-      # the last task is the task considered the packaging task
-      task
-    end
-
-    def package_as_bundle_spec(spec)
-      # Change the source distribution to .jar extension
-      spec.merge( :type => :jar )
-    end
-
-    first_time do
-      desc "Does `bnd print` on the packaged bundle and stdouts the output for inspection"
-      Project.local_task("bnd:print")
-    end
-  end
-end
-
-class Buildr::Project
-  include Buildr::Bnd
-end
+require File.expand_path(File.dirname(__FILE__) + '/buildr/bnd/version')
+require File.expand_path(File.dirname(__FILE__) + '/buildr/bnd/main')
+require File.expand_path(File.dirname(__FILE__) + '/buildr/bnd/bundle_task')
+require File.expand_path(File.dirname(__FILE__) + '/buildr/bnd/project_extension')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 3
-  version: 0.0.3
+    - 4
+  version: 0.0.4
 platform: ruby
 authors: 
   - Peter Donald
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 +10:00
+date: 2010-07-05 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,10 @@ extra_rdoc_files:
   - CHANGELOG
 files: 
   - lib/buildr_bnd.rb
+  - lib/buildr/bnd/version.rb
+  - lib/buildr/bnd/main.rb
+  - lib/buildr/bnd/bundle_task.rb
+  - lib/buildr/bnd/project_extension.rb
   - spec/spec_helper.rb
   - spec/spec.opts
   - spec/buildr/bnd/project_extension_spec.rb
@@ -51,7 +55,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
   - --title
-  - buildr-bnd 0.0.3
+  - buildr-bnd 0.0.4
   - --main
   - README.rdoc
 require_paths: