kintsugi 0.4.3 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4545555bde99b949d5f4a2963ea4e347fc7ea3a91ef22426de9854c5ccf6834
-  data.tar.gz: 5d75fff06081dabb27f43fcfc8ee36d732cae2fce4268df42feecabf285250c7
+  metadata.gz: 02b50bf2480ea4dd03996c8fe12c02f2eeae95f6e69fa782176c695637d28f9b
+  data.tar.gz: 5b8f806cd4a168c245f1d9e7e764d4dfe509ccd61d0ad653596ef929b98e5ac9
 SHA512:
-  metadata.gz: 8f1aa798183ec84869a155d7d5068c5045105ffa540b5c76bcfd4f7464c5150a36af0dbc6baf7897bf1c8f056ab53eb2cf47dd27aff0d3455391a84de5503469
-  data.tar.gz: 2f02d8522127772adf32c654335a08bb923613e3d9ce98ac36529b80a2d399e4dd711d8fc18b7ec8a6d480d3baea7e72bba13f4148363d62ac2abbaad77861a9
+  metadata.gz: 011b04ec2f4f6f32892436c21f0b0d17c8ea9ee7ab043324febbf1f56df32e65ff8176d4b205dc9541ccb1f7953d70be3085bca8ff79e56d3d06fecdcf8ece34
+  data.tar.gz: 6f923e940ad52cc62b25898f387cc7dd97fd47d93c152363c86c7e5edeedcbf02a15a405d1b5caf1e4234ed54086d0c8bf890e646ef940a1205579782b94e95a

data/.github/workflows/release.yml

@@ -0,0 +1,33 @@
+name: Release
+
+on: workflow_dispatch
+
+jobs:
+  main-job:
+    name: Release
+    runs-on: ubuntu-latest
+    env:
+      GEM_HOST_API_KEY: ${{ secrets.GEM_HOST_API_KEY }}
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.5.8
+          rubygems: latest
+
+      - name: Draft a new release
+        run: |
+          echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
+          version="v$(grep STRING lib/kintsugi/version.rb | cut -d \" -f 2)"
+          git tag $version
+          git push --tag
+          gh release create $version --generate-notes
+
+      - name: Publish to rubygems.org
+        run: |
+          gem build *.gemspec
+          gem push *.gem

data/.github/workflows/{ci.yml → tests.yml}

@@ -1,4 +1,4 @@
-name: CI
+name: Tests
 
 on:
   push:
@@ -19,6 +19,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.5.8
+          rubygems: latest
           bundler-cache: true
 
       - name: Run Rake

data/.rubocop.yml

@@ -12,6 +12,9 @@ RSpec/MultipleExpectations:
 AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.5
+  Exclude:
+    - 'lib/**/xcodeproj_extensions.rb'
+    - 'vendor/bundle/**/*'
   NewCops: enable
 
 Metrics/BlockLength:

data/bin/kintsugi

@@ -5,35 +5,9 @@
 # Created by Ben Yohay.
 
 require "kintsugi"
-require_relative "../lib/kintsugi/cli"
-require_relative "../lib/kintsugi/error"
-
-def parse_options!(command, argv)
-  options = {}
-  command.option_parser.parse!(argv, into: options)
-  options
-end
-
-def name_of_subcommand?(subcommands, argument)
-  subcommands.include?(argument)
-end
-
-first_argument = ARGV[0]
-cli = Kintsugi::CLI.new
-command =
-  if name_of_subcommand?(cli.subcommands, first_argument)
-    ARGV.shift
-    cli.subcommands[first_argument]
-  else
-    cli.root_command
-  end
-
-options = parse_options!(command, ARGV)
 
 begin
-  command.action.call(options, ARGV)
-rescue ArgumentError => e
-  puts "#{e.class}: #{e}"
-rescue Kintsugi::MergeError => e
-  puts e
+  Kintsugi.run(ARGV)
+rescue ArgumentError, Kintsugi::MergeError
+  exit(1)
 end

data/kintsugi.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "xcodeproj", ">= 1.19.0", "<= 1.21.0"
 
+  spec.add_development_dependency "git", "~> 1.11"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.9"
   spec.add_development_dependency "rubocop", "1.12.0"