scipio 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea0fe5447366a0cf4667c9c5229bedd8655b4834b723e9ec69af4a01cae2c54d
-  data.tar.gz: 4bdade6cb2e464db6652c74715ae3b36d9b5e7b1285c88f6afe84a350566842c
+  metadata.gz: 555d00709e761ef9a85713ffc2e2fb308265b818d2de11415186abd7d09386ca
+  data.tar.gz: 46bd65c8869b69d71c87ebd5b0bae64649db16ab59b7f3d415a12d4d6f58c140
 SHA512:
-  metadata.gz: b5d08adeb33365c1226e8f7a5cba3a1980c8ac7c138189f3996db45138a22e7fb884d651050a9deecdac4e2802ba78a6177b4b8a795a591f3172178069b41e45
-  data.tar.gz: bb1680babc5f474f2cae62c59d5bfcbb9b7043a57dcba7d89de69521898ecd9b23a154f85b281fe514430b324feb9b74b6fe814056d248c022a55f4c64e6fbd3
+  metadata.gz: f02466438546c1ba4fe520d9159f5bee9ce6981857341f63e69cef05ef3de2f8bc110ba134c772ea10a01bff4e7aa01147aaa4eab97668a15eaf918e589ee673
+  data.tar.gz: cbc8fecd12d0197708d929c12bce74fe786fc9b24c79970bef8c4abae98a7cb6a45954cfbe9a352f5293b54c712d5953f99989c423a34dbd420cd303122f679b

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Scipio Changelog
 
+## 0.8.0 - 28 August 2024
+
+- Breaking changes
+  - split off Rake tasks to the new Reki gem, to focus on new gems & repos here
+  - minor template changes (named arguments in the cli methods)
+- bug fix - attempt gem creation with no local template copy present
+
 ## 0.7.0 - 27 August 2024
 
 - Breaking changes

data/README.md

@@ -1,9 +1,8 @@
 # Scipio
 
-A small CLI utility to:
+A CLI utility to:
 - set up new Ruby Gems using a configurable template
 - set up local & remote git repos
-- launch Rake tasks from anywhere
 
 Set up & run Ruby projects with less typing. Scipio. Skip IO. Geddit?
 
@@ -15,13 +14,13 @@ Early days. Development status "3 - Alpha" in Python terms.
 
 ## Why
 
-I'm a big fan of Bundler & Gem as package management tools. But I'm not a fan of the assumptions about licensing (MIT or nothing), repos (just Github), & Rake that are baked into the Bundler gem command. So I built Scipio, to make gem setup a user choice. It seemed a natural place to add the ability to run Rake scripts from anywhere.
+I'm a big fan of Bundler & Gem as package management tools. But I'm not a fan of the assumptions about licensing (MIT or nothing), repos (just Github), & Rake that are baked into the Bundler gem command. So I built Scipio, to make gem setup a user choice.
 
 ## Installation
 
 `gem install scipio`
 
-You will need to have Git and Berg installed and configured, as well as the Rake gem, in order to use them all via Scipio.
+You will need to have Git and Berg installed and configured in order to use them via Scipio.
 
 ## Usage
 

data/lib/scipio/cli.rb

@@ -6,7 +6,6 @@ require "yaml"
 require_relative "config"
 require_relative "gems"
 require_relative "git"
-require_relative "rake"
 
 module Scipio
   # CLI handled by optparse
@@ -15,8 +14,7 @@ module Scipio
       @options = {}
       OptionParser.new do |opts|
         opts.banner = <<~BANNER
-          Scipio
-          Expanded help here
+          Scipio is a CLI utility to set up Ruby Gems & git repos
 
           Commands:
         BANNER
@@ -25,14 +23,11 @@ module Scipio
         init(opts:)
         local(opts:)
         naked_repo(opts:)
-        rake(opts:)
-        tasks(opts:)
         version(opts:)
       end.parse!
 
       create_gem
       create_repo
-      create_task
     rescue OptionParser::InvalidOption
       puts "Invalid option"
       # don't have opts here to show help
@@ -72,18 +67,6 @@ module Scipio
       end
     end
 
-    def rake(opts:)
-      opts.on("-r RAKE", "--rake RAKE", "Run Rake in directory RAKE, or named RAKE in config") do |opt|
-        @options[:rake] = opt
-      end
-    end
-
-    def tasks(opts:)
-      opts.on("-t TASK", "--task TASK", "Rake task, use -t -T to list tasks, leave off for the default task") do |opt|
-        @options[:task] = opt
-      end
-    end
-
     def version(opts:)
       opts.on("-v", "--version", "The version") do
         puts Scipio::VERSION
@@ -97,6 +80,7 @@ module Scipio
         config = Scipio::Config.new
         repo = Scipio::Git.new(config:, repo_name: @options[:gem])
         gem = Scipio::Gems.new(config:, gem_name: @options[:gem])
+        gem.init
 
         repo.create_dir
         repo.init_before_write
@@ -124,21 +108,5 @@ module Scipio
         exit
       end
     end
-
-    def create_task
-      if @options[:rake]
-        config = Scipio::Config.new
-        @options[:task] ||= ""
-        rake = Scipio::Rake.new(options: @options, config:)
-        rake.run
-        exit
-      end
-
-      # no rake dir or name, but a task
-      if @options[:task]
-        puts "--task requires --rake NAME, the directory or named Rake file you're calling this task on"
-        exit
-      end
-    end
   end
 end

data/lib/scipio/config.rb

@@ -8,7 +8,6 @@ module Scipio
     attr_reader :git_dir,
       :git_domain,
       :git_site,
-      :rake_dirs,
       :user_email,
       :user_fullname,
       :user_name
@@ -76,17 +75,7 @@ module Scipio
         e-mail: #{@user_email}
         name: \t#{@user_fullname}
         user: \t#{@user_name}
-
-        Rake
       INFO
-      if rake_dirs
-        rake_dirs.each do |name, dir|
-          puts "#{name} - #{dir}"
-        end
-      else
-        puts "No rake directories defined"
-      end
-      # exit
     end
 
     def ask_for_git_dir
@@ -109,7 +98,6 @@ module Scipio
       @user_email = git["user_email"]
       @user_fullname = git["user_fullname"]
       @user_name = git["user_name"]
-      @rake_dirs = config["rake"]
     end
 
     def save_file
@@ -120,9 +108,6 @@ module Scipio
                   "user_email" => @user_email,
                   "user_fullname" => @user_fullname,
                   "user_name" => @user_name
-                },
-                "rake" => {
-                  "name" => "path"
                 }}
       yaml = config.to_yaml
       File.write(Config.config_file, yaml)

data/lib/scipio/gems.rb

@@ -29,12 +29,12 @@ module Scipio
     end
 
     def init
-      FileUtils.mkdir_p @template_dir
-      unless Dir.empty? @template_dir
-        puts "Templates directory not empty - #{@template_dir}"
-        exit
+      FileUtils.mkdir_p(@template_dir)
+      if Dir.empty?(@template_dir)
+        FileUtils.cp_r(@gem_default_templates, @config_dir)
+        puts "Templates copied"
       end
-      FileUtils.cp_r(@gem_default_templates, @config_dir)
+      puts "Templates directory - #{@template_dir}"
     end
 
     def relative_out_path(path_from:)

data/lib/scipio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Scipio
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/stdlib/string.rb

@@ -18,7 +18,7 @@ class String
     split("-").map { |word| word.capitalize_first }.join("::")
   end
 
-  # this/and/that to that - used in require_relative
+  # this-and-that to that - used in require_relative
   def last_part
     File.basename(tr("-", "/"))
   end

data/template/lib/%{gem_name_slash}/cli.rb.erb

@@ -13,27 +13,30 @@ module <%= gem_name.colonize.camelize %>
 
           Commands:
         BANNER
-        help(opts)
-        options_other(opts)
-        version(opts)
+        help(opts:)
+        options_other(opts:)
+        version(opts:)
       end.parse!
+    rescue OptionParser::InvalidOption
+      puts "Invalid option"
+      # don't have opts here to show help
     end
 
-    def help(opts)
+    def help(opts:)
       opts.on("-h", "--help", "This help message") do
         puts opts
         exit
       end
     end
 
-    def options_other(opts)
+    def options_other(opts:)
       opts.on("-o", "--other", "Do... other") do |_o|
         puts "OK"
         exit
       end
     end
 
-    def version(opts)
+    def version(opts:)
       opts.on("-v", "--version", "The version") do
         puts <%= gem_name.colonize.camelize %>::VERSION
         exit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scipio
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Mike Kreuzer
@@ -35,13 +35,12 @@ cert_chain:
   YgqTixCwts6cQYIdYNFtJbzKvRNqyviKKxPaum7UWAv6Uy80gxgJ8p+fG81FsxbZ
   0ULnXrHlhf/CHs550TxRlXalgxBCImGdHzWjhdJeC1dZP3olgNtjO23ywtw=
   -----END CERTIFICATE-----
-date: 2024-08-27 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies: []
-description: |
-  A small CLI utility to:
-  - set up new Ruby Gems using a configurable template
-  - set up local & remote git repos
-  - launch Rake tasks from anywhere
+description: 'A CLI utility to set up new Ruby Gems using a configurable template,
+  & to set up local & remote git repositories.
+
+  '
 email:
 - mike@mikekreuzer.com
 executables:
@@ -60,7 +59,6 @@ files:
 - lib/scipio/config.rb
 - lib/scipio/gems.rb
 - lib/scipio/git.rb
-- lib/scipio/rake.rb
 - lib/scipio/version.rb
 - lib/stdlib/string.rb
 - template/%{gem_name}.gemspec.erb
@@ -111,6 +109,5 @@ requirements: []
 rubygems_version: 3.5.17
 signing_key:
 specification_version: 4
-summary: A small CLI utility to set up Ruby Gems & git repos, & to run Rake tasks
-  from anywhere
+summary: A CLI utility to set up Ruby Gems & git repos
 test_files: []

data/lib/scipio/rake.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler"
-
-module Scipio
-  # To call Rake from anywhere
-  class Rake
-    def initialize(options:, config:)
-      @rake = options[:rake]
-      @task = options[:task] # may be an empty string
-      @dir = config.rake_dirs
-    end
-
-    # if running without bundler
-    # https://mattbrictson.com/blog/run-shell-commands-in-ruby
-    def self.with_original_bundler_env(&)
-      return yield unless defined?(Bundler)
-      Bundler.with_original_env(&)
-    end
-
-    def run
-      dir = try_dir(rake: @rake)
-      Dir.chdir(dir) do
-        # Bundler.with_original_env do
-        Rake.with_original_bundler_env do
-          system("bundle exec rake #{@task} --trace", exception: true)
-        end
-      end
-    end
-
-    # try for a directory, then an entry in the config
-    # TODO: note - watch out for directories in the directory you're calling scipio from,
-    # rake will search the tree upwards from any directory it uses
-    def try_dir
-      dir =
-        if File.directory?(File.expand_path(@rake))
-          @rake
-        elsif @dir.key?(@rake) && File.directory?(File.expand_path(@dir[@rake]))
-          @dir[@rake]
-        else
-          p "Don't know directory or config entry - #{@rake}"
-          exit
-        end
-      File.expand_path(dir)
-    end
-  end
-end