squared 0.0.1 → 0.0.2

data/lib/squared/repo/project/ruby.rb

@@ -4,57 +4,46 @@ module Squared
   module Repo
     module Project
       class Ruby < Git
+        REF = :ruby
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
         OPT_INSTALL = %w[no-cache force quiet verbose].freeze
         OPT_UPDATE = %w[redownload local strict conservative quiet verbose].freeze
-        private_constant :GEMFILE, :OPT_INSTALL, :OPT_UPDATE
+        private_constant :REF, :GEMFILE, :OPT_INSTALL, :OPT_UPDATE
 
         class << self
+          def populate(*); end
+
           def tasks
             nil
           end
 
-          def to_sym
-            :ruby
-          end
-
-          def is_a?(path)
-            if path.is_a?(::String) || path.is_a?(::Pathname)
-              base = Pathname.new(path)
-              [*GEMFILE, 'Rakefile', 'README.rdoc'].any? { |file| base.join(file).exist? }
+          def is_a?(val)
+            if val.is_a?(::Pathname) || (val.is_a?(::String) && (val = Pathname.new(val)))
+              [*GEMFILE, *::Rake::Application::DEFAULT_RAKEFILES, 'README.rdoc'].any? { |file| val.join(file).exist? }
             else
               super
             end
           end
         end
 
-        @@tasks[:ruby] = {
+        @@tasks[REF] = {
           install: %i[redownload local prefer-local with-g without-g],
           update: %i[all patch minor major],
-          pristine: %i[version extensions]
+          pristine: %i[version extensions],
+          rake: nil
         }.freeze
 
         def initialize(name, project, workspace, **kwargs)
           super
-          if env('BUILD', suffix: 'DEV', equals: '0')
-            @dev = false
-          else
-            @dev = kwargs.delete(:dev)
-            if env('BUILD', suffix: 'DEV')
-              @dev = true
-            elsif @dev.nil?
-              @dev = @workspace.dev?
-            end
-          end
+          initialize_build(REF, **kwargs)
           @version = env('BUILD', suffix: 'VERSION', strict: true) || kwargs.delete(:version)
           @autodetect = kwargs.key?(:autodetect) ? kwargs.delete(:autodetect) : false
-          @gemdir = nil
-          return unless @output[0].nil? && @copy.nil? && !@version && !@autodetect && !doc? && (file = rakefile)
+          return if !@output[0].nil? || !@copy.nil? || @version || @autodetect || (file = rakefile).nil?
 
           begin
             pat = %r{\brequire\s+(["'])bundler/gem_tasks\1}
             File.foreach(file) do |line|
-              next unless pat.match?(line)
+              next unless line.match?(pat)
 
               @output[0] = 'bundle exec rake build'
               @copy = 'bundle exec rake install'
@@ -70,33 +59,45 @@ module Squared
           super
           return unless outdated?
 
-          namespace @name do
-            @@tasks[:ruby].each do |action, flags|
-              namespace action do
-                flags.each do |flag|
-                  case action
-                  when :install
-                    case flag
-                    when :'with-g', :'without-g'
-                      desc format_desc(action, flag, 'group+')
-                      task flag, [:group] do |_, args|
-                        install(flag, group: collect_args(args, :group))
+          namespace name do
+            @@tasks[REF].each do |action, flags|
+              if flags.nil?
+                case action
+                when :rake
+                  next unless rakefile
+
+                  desc format_desc(action, nil, 'command*')
+                  task action, [:command] do |_, args|
+                    rake collect_args(args, :command)
+                  end
+                end
+              else
+                namespace action do
+                  flags.each do |flag|
+                    case action
+                    when :install
+                      case flag
+                      when :'with-g', :'without-g'
+                        desc format_desc(action, flag, 'group+')
+                        task flag, [:group] do |_, args|
+                          install(flag, group: collect_args(args, :group))
+                        end
+                      else
+                        desc format_desc(action, flag, OPT_INSTALL)
+                        task flag, [:opts] do |_, args|
+                          install(flag, opts: collect_args(args, :opts))
+                        end
                       end
-                    else
-                      desc format_desc(action, flag, OPT_INSTALL)
+                    when :update
+                      desc format_desc(action, flag, OPT_UPDATE)
                       task flag, [:opts] do |_, args|
-                        install(flag, opts: collect_args(args, :opts))
+                        update(flag, opts: collect_args(args, :opts))
+                      end
+                    when :pristine
+                      desc format_desc(action, flag, 'version?')
+                      task flag, [:version] do |_, args|
+                        pristine(flag, version: args.version)
                       end
-                    end
-                  when :update
-                    desc format_desc(action, flag, OPT_UPDATE)
-                    task flag, [:opts] do |_, args|
-                      update(flag, opts: collect_args(args, :opts))
-                    end
-                  when :pristine
-                    desc format_desc(action, flag, 'version?')
-                    task flag, [:version] do |_, args|
-                      pristine(flag, version: args.version)
                     end
                   end
                 end
@@ -138,21 +139,21 @@ module Squared
             else
               cmd = bundle_session 'install'
             end
-            run(banner: banner?, exception: @workspace.exception)
+            run(banner: banner?, exception: workspace.exception)
           end
         end
 
-        def copy(from: 'lib', glob: '**/*', basedir: @gemdir, override: false)
+        def copy(from: 'lib', glob: '**/*', gemdir: @gemdir, override: false)
           if @copy && !override
             return super if @copy.is_a?(::String)
 
             from = @copy[:from] if @copy.key?(:from)
             glob = @copy[:glob] if @copy.key?(:glob)
-            basedir = @copy[:basedir] if @copy.key?(:basedir)
+            gemdir = @copy[:gemdir] if @copy.key?(:gemdir)
           end
-          return unless basedir
+          return unless gemdir
 
-          dest = Pathname.new(basedir).realpath
+          dest = Pathname.new(gemdir).realpath
           print_item unless @output[0]
           glob = as_a(glob)
           as_a(from).each_with_index do |val, i|
@@ -173,11 +174,11 @@ module Squared
             cmd << "--#{flag}"
           end
           append_opts opts, OPT_UPDATE
-          run(banner: banner?, exception: @workspace.exception)
+          run(banner: banner?, exception: workspace.exception)
         end
 
         def pristine(flag, version: nil)
-          cmd = gem_session 'pristine', @project
+          cmd = gem_session 'pristine', project
           case flag
           when :extensions
             cmd << '--extensions'
@@ -185,7 +186,15 @@ module Squared
             guard_params version, 'version'
           end
           cmd << "--version=#{version}" if version
-          run(banner: banner?, exception: @workspace.exception)
+          run(banner: banner?, exception: workspace.exception)
+        end
+
+        def rake(cmd)
+          if cmd.empty?
+            run_s 'rake'
+          else
+            cmd.each { |val| run_s "rake #{val}" }
+          end
         end
 
         def rakefile
@@ -197,17 +206,17 @@ module Squared
           return true if @copy && (@copy.is_a?(::String) || @copy.fetch(:gemdir, nil))
           return gemdir? if @gemdir
 
-          gem_path = -> { "gems#{::File::SEPARATOR}#{@project}-#{@version}" }
+          gempath = -> { "gems#{::File::SEPARATOR}#{project}-#{@version}" }
           if @version && (val = ENV['GEM_HOME'])
-            @gemdir = Pathname.new(val).join(gem_path.())
+            @gemdir = Pathname.new(val).join(gempath.())
             return true if gemdir?
           end
           return false unless @autodetect
 
           error = ->(hint) { raise ArgumentError, message('failed to parse', hint: hint) }
           begin
-            out = `gem -C #{shell_quote(@path)} list --local -d #{@project}`
-            data = /#{Regexp.escape(@project)} \(([^)]+)\)/.match(out)
+            out = `gem -C #{shell_quote(path)} list --local -d #{project}`
+            data = /#{Regexp.escape(project)} \(([^)]+)\)/.match(out)
             error.('version') unless data
             ver = data[1].split(/\s*,\s*/)
             if @version
@@ -223,7 +232,7 @@ module Squared
               break
             end
             error.('path') unless data
-            @gemdir = Pathname.new(data[1].strip).join(gem_path.())
+            @gemdir = Pathname.new(data[1].strip).join(gempath.())
           rescue StandardError => e
             warn e
             @version = nil
@@ -235,7 +244,7 @@ module Squared
         end
 
         def depend?
-          !@depend.nil? || outdated?
+          !!@depend || outdated?
         end
 
         def outdated?

data/lib/squared/repo/project.rb

@@ -4,37 +4,7 @@ module Squared
   module Repo
     module Project
       class << self
-        include Common::Format
-
         attr_accessor :line_width
-
-        def banner(*lines, styles: nil, pad: 0, first: false)
-          n = max_width(lines)
-          ch = ' ' * pad
-          index = -1
-          out = lines.map do |val|
-            index += 1
-            val = ch + val.ljust(n - (pad * 2)) + ch
-            if styles && (!first || index == 0)
-              sub_style(val, *styles)
-            else
-              val
-            end
-          end
-          out << ('-' * n)
-          out.join("\n")
-        end
-
-        def footer(*lines)
-          n = max_width(lines)
-          ['-' * n, *lines.map { |val| val.ljust(n) }].join("\n")
-        end
-
-        private
-
-        def max_width(lines)
-          [lines.max_by(&:size).size, line_width].max
-        end
       end
 
       @line_width = ENV.fetch('LOG_COLUMNS', 80).to_i