pkgforge 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67dc016e53b3556308397f93194e95f179f0ed8f
-  data.tar.gz: 851949abac8aa1936ca20ce45752e70452a2754b
+  metadata.gz: ad08a0c9917d1103ab0bd1979adf503ba8392f24
+  data.tar.gz: e0fd57232afdc1db7602a64859563c8950dd0dc6
 SHA512:
-  metadata.gz: 7c4c56b5d33914a22e1b672bfbef3ee6164719fd908ec969961ac7809e93188a75cace094bb29282c9c0981028b62e736b5a5c50af2adb2f32530761fb0e847d
-  data.tar.gz: a927c71b2ba703d469fb5a7419e35576e2b0483302f403885c79035a238a50e845e15fd630a85f8cfe11998a4c13e09deaae0bb1fcfcb1478df754a53f0f91af
+  metadata.gz: e7e4c3dce6b32b08f65a0394bfe32de81e7396164ba9a8bfe14d82d7edffe3daa7a3836135e0ace8af4d9643bec15c501d7851c4174dca9c441084d6e4daaac4
+  data.tar.gz: e2a30bb5f9bea0d218eee30c9fd04dc3de21c831698915d22167afacd63f2c18d3021e1c35ac3ce0d5cf26f5c49c7b0e6c59269e8e14b8c8d14b7dce2d3f9341

data/lib/pkgforge.rb

@@ -8,12 +8,12 @@ require 'pkgforge/components/configure'
 require 'pkgforge/components/deps'
 require 'pkgforge/components/dirs'
 require 'pkgforge/components/metadata'
+require 'pkgforge/components/package'
 require 'pkgforge/components/patch'
 require 'pkgforge/components/run'
 require 'pkgforge/components/source'
 require 'pkgforge/components/test'
 require 'pkgforge/components/upload'
-require 'pkgforge/components/version'
 
 ##
 # DSL engine for compiling Arch packages

data/lib/pkgforge/base.rb

@@ -36,8 +36,5 @@ module PkgForge
 
     class Test < PkgForge::Base
     end
-
-    class Version < PkgForge::Base
-    end
   end
 end

data/lib/pkgforge/components/package.rb

@@ -0,0 +1,36 @@
+require 'fileutils'
+
+module PkgForge
+  ##
+  # Add upload methods to Forge
+  class Forge
+    Contract None => nil
+    def package!
+      add_license!
+      make_tarball!
+      copy_tarball!
+    end
+
+    private
+
+    Contract None => nil
+    def make_tarball!
+      Dir.chdir(tmpdir(:release)) do
+        run_local "tar -czvf #{tmpfile(:tarball)} *"
+      end
+      nil
+    end
+
+    Contract None => String
+    def git_hash
+      `git rev-parse --short HEAD`.rstrip
+    end
+
+    Contract None => nil
+    def copy_tarball!
+      FileUtils.mkdir_p 'pkg'
+      FileUtils.cp tmpfile(:tarball), "pkg/#{name}-#{git_hash}.tar.gz"
+      nil
+    end
+  end
+end

data/lib/pkgforge/components/upload.rb

@@ -4,38 +4,24 @@ module PkgForge
   class Forge
     Contract None => nil
     def push!
-      add_license!
-      make_tarball!
-      update_repo!
       upload_artifact!
     end
 
     private
 
-    Contract None => nil
-    def make_tarball!
-      Dir.chdir(tmpdir(:release)) do
-        run_local "tar -czvf #{tmpfile(:tarball)} *"
-      end
-      nil
-    end
-
-    Contract None => nil
-    def update_repo!
-      run_local "git tag -f '#{full_version}'"
-      run_local 'git push --tags origin master'
-      sleep 2
-      nil
+    Contract None => String
+    def version
+      @version ||= `git describe --abbrev=0 --tags`.rstrip
     end
 
     Contract None => nil
     def upload_artifact!
       run_local [
         'targit',
-        '--authfile', '.targit',
+        '--authfile', '.github',
         '--create',
         '--name', "#{name}.tar.gz",
-        "#{org}/#{name}", full_version, tmpfile(:tarball)
+        "#{org}/#{name}", version, tmpfile(:tarball)
       ]
       nil
     end

data/lib/pkgforge/version.rb

@@ -1,5 +1,5 @@
 ##
 # Declare version number
 module PkgForge
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pkgforge
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Les Aker
@@ -134,12 +134,12 @@ files:
 - lib/pkgforge/components/deps.rb
 - lib/pkgforge/components/dirs.rb
 - lib/pkgforge/components/metadata.rb
+- lib/pkgforge/components/package.rb
 - lib/pkgforge/components/patch.rb
 - lib/pkgforge/components/run.rb
 - lib/pkgforge/components/source.rb
 - lib/pkgforge/components/test.rb
 - lib/pkgforge/components/upload.rb
-- lib/pkgforge/components/version.rb
 - lib/pkgforge/version.rb
 - pkgforge.gemspec
 - spec/pkgforge_spec.rb

data/lib/pkgforge/components/version.rb

@@ -1,52 +0,0 @@
-module PkgForge
-  ##
-  # Add version methods to Forge
-  class Forge
-    attr_writer :version_block
-
-    Contract None => Proc
-    def version_block
-      @version_block ||= proc { raise 'No version block provided' }
-    end
-
-    Contract None => String
-    def version
-      @version ||= Dir.chdir(tmpdir(:build)) do
-        PkgForge::DSL::Version.new(self).instance_eval(&version_block)
-      end
-    end
-
-    Contract None => Num
-    def revision
-      @revision ||= `git describe --abbrev=0 --tags`.split('-').last.to_i + 1
-    end
-
-    Contract None => String
-    def full_version
-      "#{version}-#{revision}"
-    end
-  end
-
-  module DSL
-    ##
-    # Add version methods to Forge DSL
-    class Forge
-      Contract Func[None => Maybe[String]] => nil
-      def version(&block)
-        @forge.version_block = block
-        nil
-      end
-    end
-
-    ##
-    # Add version methods to Version DSL
-    class Version
-      Contract Maybe[Regexp], Maybe[String] => String
-      def git_tag(regex = nil, replace = '\1')
-        tag = `git describe --tags`.rstrip
-        tag.gsub!(regex, replace) if regex
-        tag
-      end
-    end
-  end
-end