libertine 0.0.1 → 0.0.2

data/.gitignore

@@ -1,2 +1,3 @@
-*.gem*
+*.gemspec
+.manifest
 tmp

data/Rakefile

@@ -2,9 +2,9 @@
 # itself to drive this Rakefile.
 
 $:.unshift "./lib"
-
-begin require "libertine"; rescue LoadError; abort "Install libertine." end
+require "libertine"
 
 Libertine do
   by "John Barnette", "code@jbarnette.com"
+  ruby ">= 1.8.7"
 end

data/lib/libertine.rb

@@ -6,7 +6,7 @@ require "isolate/rake"
 Isolate.now! :system => false
 
 module Libertine
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end
 
 def Libertine name = nil, &block

data/lib/libertine/project.rb

@@ -1,7 +1,7 @@
 require "libertine/error"
+require "libertine/scm/git"
 require "rubygems/builder"
 require "rubygems/specification"
-require "rubygems/version"
 
 Gem.configuration.verbose = false
 
@@ -9,15 +9,18 @@ module Libertine
   class Project
     attr_reader :dir
     attr_reader :name
+    attr_reader :scm
 
     def initialize name, dir = nil, &block
       @authors  = []
       @dir      = dir || "."
       @emails   = []
+      @excludes = []
       @homepage = "http://github.com/#{ENV['USER']}/#{name}"
-      @includes = []
+      @includes = %w(.manifest)
       @name     = name
       @ruby     = ">= 1.8.7"
+      @scm      = Libertine::SCM::Git.new @dir
 
       if readme = glob("README*").first
         grafs = File.read(readme).delete("\r").split(/\n\n+/).reject do |t|
@@ -41,26 +44,41 @@ module Libertine
       desc ? @description = desc : @description
     end
 
+    def exclude *globs
+      @excludes.concat globs
+    end
+
     def files
-      `git ls-files`.split.concat @includes
+      Dir.chdir dir do
+        scm.files.tap do |ls|
+          includes = @includes.map { |i| Dir[i] }.flatten
+          excludes = @excludes.map { |x| Dir[x] }.flatten
+
+          ls.concat includes
+          ls.reject! { |f| excludes.include? f }
+
+          ls.uniq!
+          ls.sort!
+        end
+      end
     end
 
     def gemfile
       "tmp/#{spec.file_name}"
     end
 
-    def homepage url = nil
-      url ? @homepage = url : @homepage
-    end
-
     def glob *globs
       Dir.chdir dir do
         Dir[*globs].select { |f| files.include? f }
       end
     end
 
-    def include *files
-      @includes.concat files
+    def homepage url = nil
+      url ? @homepage = url : @homepage
+    end
+
+    def include *globs
+      @includes.concat globs
     end
 
     def inspect
@@ -90,7 +108,7 @@ module Libertine
         s.required_ruby_version = ruby
         s.rubyforge_project     = name
         s.summary               = summary
-        s.version               = version
+        s.version               = scm.version
 
         if rubygems
           s.required_rubygems_version = rubygems
@@ -104,7 +122,8 @@ module Libertine
           end
         end
 
-        unless s.dependencies.any? { |d| d.name == "libertine" }
+        unless name == "libertine" ||
+            s.dependencies.any? { |d| d.name == "libertine" }
           s.add_development_dependency "libertine", ">= #{VERSION}"
         end
 
@@ -122,10 +141,6 @@ module Libertine
       summ ? @summary = summ : @summary
     end
 
-    def released?
-      versions.include? version
-    end
-
     def tasks!
       file(gemfile => files) do |t|
         Gem::Builder.new(spec).build
@@ -138,44 +153,21 @@ module Libertine
       desc "Show the current gemspec."
       task("gem:spec") { puts spec.to_ruby }
 
-      desc "Release v#{version}." unless released?
-      task "release" => "gem" do
-        if released?
-          raise Libertine::Error, "v#{version} is already released!"
-        end
-
-        unless /^\* master$/ =~ `git branch`
-          raise Libertine::Error, "Only release from the master branch!"
-        end
-
-        unless `git status -s`.empty?
-          sh "git commit --allow-empty -am 'Release v#{version}.'"
+      desc "Show the file manifest."
+      task "manifest" do
+        files.join("\n").tap do |manifest|
+          File.open(".manifest", "wb") { |f| f.write manifest }
+          puts manifest
         end
-
-        sh "git tag v#{version}"
-        sh "git push origin master"
-        sh "git push origin v#{version}"
-        sh "gem push #{gemfile}"
       end
-    end
 
-    def version
-      return @version if defined? @version
-      regexp = /VERSION += +([\"\'])([\d][\w\.]+)\1/
-
-      files.select { |f| %r%lib/.*\.rb\Z% =~ f }.each do |file|
-        break if @version = File.read(file)[regexp, 2]
+      if scm.releaseable?
+        desc "Release v#{scm.version}." unless scm.released?
+        task "release" => "gem" do
+          scm.release
+          sh "gem push #{gemfile}"
+        end
       end
-
-      @version or raise Libertine::Error,
-        "Can't find VERSION in lib/*.rb. Add it."
-    end
-
-    def versions
-      `git tag -l 'v*'`.split("\n").
-        select { |t| /^v\d/ =~ t }.
-        map { |t| t[1..-1] }.
-        sort_by { |v| Gem::Version.new v }
     end
   end
 end

data/lib/libertine/scm.rb

@@ -0,0 +1,50 @@
+require "libertine/error"
+require "rubygems/version"
+
+module Libertine
+  class SCM < Struct.new(:dir)
+    def files # FIX: includes & excludes here instead?
+      implement :files, []
+    end
+
+    def implement method, default = nil
+      $stderr.puts "#{self.class.name}##{method} isn't implemented!"
+      default
+    end
+
+    def release
+      if released? version
+        raise Libertine::Error, "v#{version} is already released!"
+      end
+    end
+
+    def released? version = nil
+      versions.include? version || self.version
+    end
+
+    def releaseable?
+      false
+    end
+
+    def tags
+      implement :tags, []
+    end
+
+    def version
+      return @version if defined? @version
+      regexp = /VERSION += +([\"\'])([\d][\w\.]+)\1/
+
+      files.select { |f| %r%lib/.*\.rb\Z% =~ f }.each do |file|
+        break if @version = File.read(file)[regexp, 2]
+      end
+
+      @version or raise Libertine::Error,
+        "Can't find VERSION in lib/*.rb. Add it."
+    end
+
+    def versions
+      tags.select { |t| /\Av#{Gem::Version::VERSION_PATTERN}\Z/ =~ t }.
+        map { |t| t[1..-1] }.sort_by { |v| Gem::Version.new v }
+    end
+  end
+end

data/lib/libertine/scm/git.rb

@@ -0,0 +1,38 @@
+require "libertine/error"
+require "libertine/scm"
+
+module Libertine
+  class SCM
+    class Git < Libertine::SCM
+      def files 
+        Dir.chdir(dir) { `git ls-files`.split }
+      end
+
+      def release
+        super
+
+        Dir.chdir dir do
+          unless /^\* master$/ =~ `git branch`
+            raise Libertine::Error, "Only release from the master branch!"
+          end
+
+          unless `git status -s`.empty?
+            sh "git commit --allow-empty -am 'Release v#{version}.'"
+          end
+
+          sh "git tag v#{version}"
+          sh "git push origin master"
+          sh "git push origin v#{version}"
+        end
+      end
+
+      def releaseable?
+        true
+      end
+
+      def tags
+        Dir.chdir(dir) { `git tag -l 'v*'`.split }
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - John Barnette
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 -07:00
+date: 2010-10-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,21 +46,6 @@ dependencies:
         version: 1.7.2
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: libertine
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
-  type: :development
-  version_requirements: *id003
 description: Because there aren't enough ways to manage a RubyGem with a Rakefile. Libertine assumes Ruby 1.8.7+, Git, GitHub, and a Unixish operating system. Don't use this yet.
 email: 
 - code@jbarnette.com
@@ -72,6 +57,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .manifest
 - .rvmrc
 - Isolate
 - README.markdown
@@ -79,6 +65,8 @@ files:
 - lib/libertine.rb
 - lib/libertine/error.rb
 - lib/libertine/project.rb
+- lib/libertine/scm.rb
+- lib/libertine/scm/git.rb
 has_rdoc: true
 homepage: http://github.com/jbarnette/libertine
 licenses: []