vershunt 2.0.4

data/lib/msp_release/project/debian.rb

@@ -0,0 +1,168 @@
+#
+# This kind of project stores the version in the debian changelog
+#
+module MSPRelease
+  module Project::Debian
+
+    class BuildResult
+      def initialize(dir, project)
+        @dir = dir
+        @project = project
+
+        looking_for = project.changelog.version.to_s
+        changes_file = find_changes_file(looking_for)
+        if changes_file && File.exists?(changes_file)
+          @changes_file = changes_file
+        else
+          raise NoChangesFileError, looking_for
+        end
+      end
+
+      attr_reader :changes_file
+
+      alias :package :changes_file
+
+      def files
+        dir = File.dirname(changes_file)
+        changes = File.read(changes_file).split("\n")
+        files_start = changes.index {|l| /^Files: $/.match(l) } + 1
+        changes[files_start..-1].map {|l| File.join(dir, l.split(" ").last) } +
+          [changes_file]
+      end
+
+      def available_changes_files
+        Dir["#{@dir}/*.changes"]
+      end
+
+      def changes_pattern
+        /#{@project.source_package_name}_([^_]+)_([^\.]+)\.changes/
+      end
+
+      def find_changes_file(version_string)
+        available_changes_files.find { |fname|
+          (m = changes_pattern.match(File.basename(fname))) && m && (m[1] == version_string)
+        }
+      end
+    end
+
+    DEFAULT_PATH = "debian/msp/changelog"
+
+    def write_version(new_version)
+      debian_version = Debian::Versions::Unreleased.new_from_version(new_version)
+      changelog.add(debian_version, "New version")
+
+      defined?(super) ?
+        Array(super).push(changelog.fname) :
+        [changelog.fname]
+    end
+
+    def version
+      changelog.version.to_version
+    end
+
+    def changelog_path
+      @changelog_path || 'debian/changelog'
+    end
+
+    def source_package_name
+      debian_dir = File.dirname(File.join(@dir, changelog_path))
+      control_file = File.join(debian_dir + '/control')
+      source_line = MSPRelease::Exec.exec("grep Source: #{control_file}")
+      match = /^Source: (.+)$/.match(source_line)
+      match && match[1]
+    end
+
+    def name
+      source_package_name
+    end
+
+    def changelog
+      Debian.new(@dir, changelog_path)
+    end
+
+    def next_version_for_release(options = {})
+      deb_version = changelog.version
+      distribution = options[:distribution] || changelog.distribution
+
+      new_version =
+        if deb_version.to_version != version
+          LOG.warn "Warning: project version (#{version.to_s}) " +
+            "did not match changelog version (#{deb_version.to_s}), project " +
+              "version wins"
+          changelog.reset_at(version)
+        else
+          deb_version.bump
+        end
+
+      LOG.debug "Adding new entry to changelog..."
+      changelog.add(new_version, "New release", distribution)
+
+      LOG.debug "Changelog now at #{new_version}"
+      puts_changelog_info
+
+      new_version
+    end
+
+    def puts_changelog_info
+      LOG.debug "OK, please update the change log, then run 'vershunt push' to"\
+        " push your changes for building"
+    end
+
+    def project_specific_push(release_name)
+      # Create a release commit.
+      commit_message = release_commit_message(release_name)
+      exec "git add #{changelog.fname}"
+      exec "git commit -m\"#{commit_message}\""
+    end
+
+    def prepare_for_build(branch_name, options={})
+      branch_is_release_branch = !! /^release-.+$/.match(branch_name)
+      distribution = options[:distribution] || changelog.distribution
+
+      rename_dir_for_build(branch_name, distribution)
+
+      super if defined?(super)
+    end
+
+    def rename_dir_for_build(branch_name, distribution)
+      branch_is_release_branch = !! /^release-.+$/.match(branch_name)
+      new_dir = Dir.chdir(@dir) do
+        if branch_is_release_branch
+          first_commit_hash, commit_message =
+            find_first_release_commit
+
+          if first_commit_hash.nil?
+            raise CLI::Exit, "Could not find a release commit on #{pathspec}"
+          end
+
+          clean_checkout
+        else
+          dev_version = Debian::Versions::Development.
+            new_from_working_directory(branch_name, latest_commit_hash)
+
+          changelog.amend(dev_version, distribution)
+        end
+        name + "-" + changelog.version.to_s
+      end
+      FileUtils.mv(@dir, new_dir)
+      @dir = new_dir
+    end
+
+    def build_opts(options={})
+      @sign = options[:sign]
+    end
+
+    def build_command(options={})
+      if cmd = config[:deb_build_command]
+        cmd
+      else
+        "dpkg-buildpackage" + (@sign ? '' : ' -us -uc')
+      end
+    end
+
+    def build_result(dir)
+      BuildResult.new(dir, self)
+    end
+
+  end
+end

data/lib/msp_release/project/gem.rb

@@ -0,0 +1,74 @@
+
+module MSPRelease
+  module Project::Gem
+    include MSPRelease::Exec::Helpers
+
+    class BuildResult
+      def initialize(dir, project)
+        @dir = dir
+        @project = project
+      end
+
+      def package
+        "#{@dir}/#{@project.gemspec_name}-#{@project.version}.gem"
+      end
+
+      def files
+        [package]
+      end
+    end
+
+    def gemspec_file
+      files = Dir.glob("#{@dir}/*.gemspec")
+
+      LOG.warn "Warning: more than one gemspec found" if files.count > 1
+      raise "Can't find gemspec" if files.count < 0
+
+      files.first
+    end
+
+    def gemspec_name
+      @gemspec_name ||= Dir.chdir(@dir) do
+        File.new(gemspec_file, 'r').readlines.find { |l|
+          l =~ /\w+\.name\s*=\s*(['"])([\w-]+)\1/
+        }
+        $2
+      end
+    end
+
+    def name
+      gemspec_name
+    end
+
+    def next_version_for_release(options={})
+      tag = "release-#{version}"
+      check_tag = exec("git show-ref --tags #{tag}", :status => [0,1])
+      unless check_tag == ""
+         LOG.error "Tag #{tag} already exists, you must bump the version before"\
+           " the next release"
+         exit(1)
+      end
+      version
+    end
+
+    def prepare_for_build(branch_name, options={})
+      # new_dir = "#{gemspec_name}"
+
+      # FileUtils.mv(@dir, new_dir)
+      # @dir = new_dir
+
+      clean_checkout
+
+      super if defined?(super)
+    end
+
+    def build_command
+      "gem build #{gemspec_file}"
+    end
+
+    def build_result(output_directory)
+      BuildResult.new(@dir, self)
+    end
+
+  end
+end

data/lib/msp_release/project/git.rb

@@ -0,0 +1,76 @@
+# Mixin module for git projects.
+module MSPRelease
+  module Project::Git
+
+    def prepare_for_build(branch_name, options={})
+      branch_is_release_branch = !! /^release-.+$/.match(branch_name)
+      shallow_output = options[:shallow_output]
+
+      if branch_name && branch_is_release_branch
+        LOG.debug("Checking out latest release commit from origin/#{branch_name}#{shallow_output}")
+      else
+        LOG.debug("Checking out latest commit from origin/#{branch_name}#{shallow_output}")
+      end
+
+      pathspec = "origin/#{branch_name}"
+      if pathspec != "origin/master"
+        move_to(pathspec)
+      end
+      super if defined?(super)
+    end
+
+    def move_to(pathspec)
+      Dir.chdir(@dir) do
+        begin
+          exec("git show #{pathspec} --")
+        rescue MSPRelease::Exec::UnexpectedExitStatus => e
+          if /^fatal: bad revision/.match(e.stderr)
+            raise MSPRelease::CLI::Exit, "Git pathspec '#{pathspec}' does not exist"
+          else
+            raise
+          end
+        end
+
+        exec("git checkout #{pathspec}")
+      end
+    end
+
+    def log_command
+      Dir.chdir(@dir) do
+        "git --no-pager log --no-color --full-index"
+      end
+    end
+
+    def oneline_pattern
+      /^([a-z0-9]+) (.+)$/i
+    end
+
+    def find_first_release_commit
+      all_commits = exec(log_command +  " --pretty=oneline").
+        split("\n")
+
+      all_commits.map { |commit_line|
+        match = oneline_pattern.match(commit_line)
+        [match[1], match[2]]
+      }.find {|hash, message|
+        release_name_from_message(message)
+      }
+    end
+
+    def latest_commit_hash
+      output = exec(log_command + " --pretty=oneline -1").split("\n").first
+      oneline_pattern.match(output)[1]
+    end
+
+
+    def clean_checkout
+      Dir.chdir(@dir) do
+        first_commit_hash, commit_message = find_first_release_commit
+
+        exec "git reset --hard #{first_commit_hash}"
+      end
+    end
+
+  end
+end
+

data/lib/msp_release/project/ruby.rb

@@ -0,0 +1,40 @@
+#
+# This kind of project uses a ruby file with a VERSION constant to be the
+# authorative source for the version
+#
+module MSPRelease::Project::Ruby
+
+  attr_reader :ruby_version_file
+
+  def version_pattern
+    /VERSION *= *(['"])([0-9]+)\.([0-9]+)\.([0-9]+)\1/
+  end
+
+  def write_version(new_version)
+    lines = File.open(ruby_version_file, 'r')  { |f| f.readlines }
+    lines = lines.map do |line|
+      if match = version_pattern.match(line)
+        line.gsub(/( *VERSION *= *)(['"]).+\2$/, "\\1\\2#{new_version.to_s}\\2")
+      else
+        line
+      end
+    end
+
+    File.open(ruby_version_file, 'w')  { |f| f.write(lines) }
+
+    defined?(super) ?
+      Array(super).push(ruby_version_file) :
+      [ruby_version_file]
+  end
+
+  def version
+    Dir.chdir(@dir) do
+      File.open(ruby_version_file, 'r') do |f|
+        v_line = f.readlines.map {|l|version_pattern.match(l)}.compact.first
+        raise "Couldn't parse version from #{ruby_version_file}" unless v_line
+        MSPRelease::Version.new(* (2..4).map {|i|v_line[i]} )
+      end
+    end
+  end
+
+end

data/lib/msp_release/version.rb

@@ -0,0 +1,3 @@
+module MSPRelease
+  VERSION = '2.0.4'
+end

metadata

@@ -0,0 +1,116 @@
+--- !ruby/object:Gem::Specification 
+name: vershunt
+version: !ruby/object:Gem::Version 
+  version: 2.0.4
+platform: ruby
+authors: 
+- nick@playlouder.com
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2015-04-29 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: POpen4
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: climate
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.8.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id005 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
+description: Maintain versioning information in a consistent way, then build debian packages consistently.
+email: 
+- nick@playlouder.com
+executables: 
+- vershunt
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- bin/vershunt
+- lib/msp_release.rb
+- lib/msp_release/build.rb
+- lib/msp_release/cli.rb
+- lib/msp_release/cli/branch.rb
+- lib/msp_release/cli/build.rb
+- lib/msp_release/cli/bump.rb
+- lib/msp_release/cli/checkout.rb
+- lib/msp_release/cli/distrib.rb
+- lib/msp_release/cli/help.rb
+- lib/msp_release/cli/new.rb
+- lib/msp_release/cli/push.rb
+- lib/msp_release/cli/reset.rb
+- lib/msp_release/cli/status.rb
+- lib/msp_release/debian.rb
+- lib/msp_release/exec.rb
+- lib/msp_release/git.rb
+- lib/msp_release/log.rb
+- lib/msp_release/make_branch.rb
+- lib/msp_release/options.rb
+- lib/msp_release/project.rb
+- lib/msp_release/project/base.rb
+- lib/msp_release/project/debian.rb
+- lib/msp_release/project/gem.rb
+- lib/msp_release/project/git.rb
+- lib/msp_release/project/ruby.rb
+- lib/msp_release/version.rb
+homepage: 
+licenses: []
+
+metadata: {}
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id005
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id005
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 2.4.6
+signing_key: 
+specification_version: 4
+summary: Repeatable build system tool
+test_files: []
+