rfix 1.1.1.pre → 1.1.4.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd96e76cafc6a288cb5df13b2480059aa408abefab74c4fa10932d67d5f955f
-  data.tar.gz: e4a96eb5322a6782fe3dc2983c59789f60226a61c6b79e7e88c3805137e1cf67
+  metadata.gz: 6fbe425b94572358cfdd552e9e3167739344b05bee8d7348744fc2a7402d670c
+  data.tar.gz: ab127357057f5ce2e23fd3a8625e19ef68f70d6328f6cdd6b76ef80e656a84b4
 SHA512:
-  metadata.gz: 064f9537855fc01eeb0a584db2627518d6e49de21f6a057682ec18730afff08ea2abc8d1a61a5d47a812b442be711f6afca41c0cd88f381f7cd447ca8a7c03f4
-  data.tar.gz: 04d6c3383940faccfb95696b77fa97eaf5483b1c3c9dd579b022d2d4018e23857c081dc66aae6f3626f47fc13e22486c3e5acaaedfd8d80be68cc073383466e3
+  metadata.gz: d03d86c10e9160006bb3a0bedc1d04dffa975666105c229ac961d50452781f6cdb039b392b98566bc75c27f97f3afe0880e5b6a13c00c021d36b69813bd1567b
+  data.tar.gz: bb6237ef9601094acc513b17121ed7047c3dfa049835d562782a0f52ebea35e9b33001fd6939e105b0e2f9450c4d18295152b5f9ef1d486af98c30f673a92722

data/.github/workflows/main.yml

@@ -0,0 +1,38 @@
+---
+name: pre-release
+on: [push]
+env:
+  RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+  GITHUB_API_TOKEN: ${{secrets.API_KEY}}
+jobs:
+  setup:
+    container: ruby:2.7
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - run: apt-get update -y
+      - run: apt-get install -y bash git libffi-dev build-essential wget cmake
+
+      - run: gem install bundler
+      - run: bundle config build.rugged --use-system-libraries
+      - run: bundle config build.ffi --use-system-libraries
+      - run: gem install rake rspec colorize
+      - run: rake libgit2:install
+
+      - run: bundle install --path vendor/bundle
+      - run: rake execute:local execute:origin execute:lint execute:branch
+
+      - run: git config user.email "linus@oleander.io"
+      - run: git config user.name "Linus Oleander"
+
+      - name: Publish to RubyGems
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          gem build *.gemspec
+          gem push *.gem
+        env:
+          GEM_HOST_API_KEY: "Bearer ${{secrets.RUBYGEMS_API_KEY}}"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rfix (1.1.1.pre)
+    rfix (1.1.4.pre)
       cri (~> 2.15.10)
       listen (~> 3.0)
       rainbow (~> 3.0)

data/lib/rfix/branches/head.rb

@@ -1,3 +1,5 @@
+require_relative "base"
+
 module Rfix
   class Branch::Head < Branch::Base
     def resolve(with:)

data/lib/rfix/branches/main.rb

@@ -1,4 +1,5 @@
 require "rugged"
+require_relative "base"
 
 module Rfix
   class Branch::Main < Branch::Base

data/lib/rfix/branches/name.rb

@@ -1,3 +1,5 @@
+require_relative "base"
+
 module Rfix
   class Branch::Name < Branch::Base
     attr_reader :name
@@ -10,7 +12,7 @@ module Rfix
       unless branch = with.branches[name]
         raise Branch::UnknownBranchError.new("Could not find branch {{error:#{name}}}")
       end
-      
+
       with.lookup(with.merge_base(branch.target_id, with.head.target_id))
     rescue Rugged::ReferenceError
       raise Branch::UnknownBranchError.new("Could not find branch {{error:#{name}}}")

data/lib/rfix/branches/reference.rb

@@ -1,3 +1,5 @@
+require_relative "base"
+
 module Rfix
   class Branch::Reference < Branch::Base
     attr_reader :reference

data/lib/rfix/branches/upstream.rb

@@ -1,3 +1,5 @@
+require_relative "base"
+
 module Rfix
   class Branch::Upstream < Branch::Base
     def resolve(with:)

data/lib/rfix/rake/paths.rb

@@ -8,11 +8,11 @@ end
 module Bundle
   INSTALL = "bundle:install".freeze
   ADD = "bundle:git:add".freeze
-  CONFIG = File.join(__dir__, "../../../.rubocop.yml")
   TAG = "rally-point".freeze
   REBUILD = "bundle:rebuild".freeze
   BUILD = "bundle:build".freeze
-  ROOT = File.expand_path(File.join(__dir__, "../../.."))
+  ROOT = Dir.getwd
+  CONFIG = File.join(ROOT, ".rubocop.yml")
   DIR = File.join(ROOT, "spec/fixtures")
   TMP = File.join(ROOT, "tmp")
 

data/lib/rfix/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rfix
-  VERSION = "1.1.1.pre"
+  VERSION = "1.1.4.pre"
 end

data/rfix.gemspec

@@ -11,6 +11,8 @@ Gem::Specification.new do |spec|
 
   if ENV["TRAVIS"]
     spec.version = "#{Rfix::VERSION}-#{ENV.fetch('TRAVIS_BUILD_NUMBER')}"
+  elseif ENV["GITHUB_RUN_ID"]
+    spec.version = "#{Rfix::VERSION}-#{ENV.fetch('GITHUB_RUN_ID')}"
   else
     # rubocop:disable Gemspec/DuplicatedAssignment
     spec.version = Rfix::VERSION

data/tasks/execute.rake

@@ -0,0 +1,38 @@
+require "rake/clean"
+require "tmpdir"
+require "pathname"
+
+repo_path = Pathname.new(Dir.mktmpdir)
+
+CLEAN.include(repo_path)
+
+namespace :execute do
+  task local: [repo_path, :install] do
+    chdir(repo_path) do
+      sh "rfix local"
+    end
+  end
+
+  task branch: [repo_path, :install] do
+    chdir(repo_path) do
+      sh "rfix branch master"
+    end
+  end
+
+  task origin: [repo_path, :install] do
+    chdir(repo_path) do
+      sh "rfix origin"
+    end
+  end
+
+  task lint: [repo_path, :install] do
+    chdir(repo_path) do
+      sh "rfix lint"
+    end
+  end
+
+  file repo_path => :rebuild do
+    sh "git clone spec/fixtures/complex.bundle #{repo_path} --branch master"
+    sh "git  --work-tree=#{repo_path} branch --set-upstream-to origin/master"
+  end
+end

data/tasks/libgit2.rake

@@ -0,0 +1,33 @@
+require "rake/clean"
+require "tmpdir"
+require "pathname"
+
+root_path = Pathname.new(Dir.mktmpdir)
+# root_path = Pathname.new(__dir__).join("../tmp")
+libgit2_gz_path = root_path.join("v1.0.1.tar.gz")
+libgit2_path = root_path.join("libgit2-1.0.1")
+
+CLEAN.include(root_path)
+
+namespace :libgit2 do
+  task build: libgit2_path do
+    chdir(libgit2_path) do
+      sh "cmake ."
+      sh "make"
+    end
+  end
+
+  task install: :build do
+    chdir(libgit2_path) do
+      sh "make install"
+    end
+  end
+
+  file libgit2_gz_path do
+    sh "wget -O #{libgit2_gz_path} https://github.com/libgit2/libgit2/archive/v1.0.1.tar.gz"
+  end
+
+  file libgit2_path => libgit2_gz_path do
+    sh "tar xzf #{libgit2_gz_path} -C #{root_path}"
+  end
+end

data/tasks/simple.rake

@@ -42,6 +42,10 @@ namespace :bundle do
 
         sh "git init"
         sh "git add .gitignore"
+
+        sh "git config user.email 'you@example.com'"
+        sh "git config user.name 'Your Name'"
+        
         sh "git commit -m 'A Commit Message'"
 
         sh "git config push.default current"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfix
 version: !ruby/object:Gem::Version
-  version: 1.1.1.pre
+  version: 1.1.4.pre
 platform: ruby
 authors:
 - Linus Oleander
@@ -205,6 +205,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -289,6 +290,8 @@ files:
 - tasks/bump.rake
 - tasks/bundle.rake
 - tasks/complex.rake
+- tasks/execute.rake
+- tasks/libgit2.rake
 - tasks/simple.rake
 - tasks/travis.rake
 - tasks/vendor.rake