cli-mastermind 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8db2ac9239f2def0778c23ee6a02f8e9955d4de5acfb1247e024a108ab4ac260
-  data.tar.gz: 3a532c3c20cb827a781852ab02062928bb5edb0408ffd3c02348c0b6175e2856
+  metadata.gz: b77931d1ca0f264d32626bd535ac1b865230156182f46e1c52eea2d77dac0684
+  data.tar.gz: 170465e4aed0ac88fb1faf9a586b70276f32dea2eec30f194b7edbc8cbce87dd
 SHA512:
-  metadata.gz: 9cb69d8818573049fca65ef43d2b83c6d4931ca69a2d98ff87ec1d36c6002f1c15c7f7bb45daa687e796bf3ff117a348883ff9203f055576f59dcb9a70dbb834
-  data.tar.gz: 2c24a20bedc2e188825393cc853da61e29668b78e6760cd378d10ff41a7a0716dbb857e08373d14ac5b53c59c4d29bd11c37c66027cac7a51f2b20ec3d83364b
+  metadata.gz: 98a87cf788c133fdc60d3ee14a0e356839c85f6b45ca9b95e490619126a511f261d81b949ae46cd16912d27325a214cbb27982be4d0eae830ec9074e41e92424
+  data.tar.gz: 7cf8df99f7168abb8510c87a24b9568d3e3cfec599424ab698279abec36f57ade58b51f4f812860f2d8101ade4fec76b1236150fef5e54877b91c40a45e29369

data/lib/cli/mastermind/configuration.rb

@@ -63,11 +63,16 @@ module CLI
       # Loads all plan files added using +add_plans+
       # @see Plan.load
       def load_plans
-        @plans ||= @plan_files.reduce({}) do |hash, file|
+        @plans = {}
+
+        top_level_plan = Plan.new('temporary_plan')
+
+        @plan_files.each do |file|
           plans = Plan.load file
-          plans.each { |plan| hash[plan.name] = plan }
-          hash
+          top_level_plan.add_children plans
         end
+
+        @plans = top_level_plan.children
       end
 
       # Loads a masterplan using the DSL, if it exists and hasn't been loaded already

data/lib/cli/mastermind/errors.rb

@@ -8,5 +8,8 @@ module CLI
         super "Unsupported file type: #{extension}"
       end
     end
+
+    class InvalidPlanError < Error
+    end
   end
 end

data/lib/cli/mastermind/loader/planfile_loader.rb

@@ -7,6 +7,9 @@ module CLI::Mastermind
         DSL.new(filename).plans
       end
 
+      class InvalidPlanfileError < Error
+      end
+
       private
 
       class DSL
@@ -14,21 +17,22 @@ module CLI::Mastermind
 
         def initialize(filename=nil, &block)
           @plans = []
+          @filename = filename
 
           if block_given?
             instance_eval(&block)
           elsif File.exists? filename
             instance_eval(File.read(filename), filename, 0)
           else
-            raise 'Must provide valid path to a planfile or a block', Error
+            raise InvalidPlanfileError, 'Must provide valid path to a planfile or a block'
           end
         end
 
         def plot(name, &block)
-          plan = Plan.new name, @description
+          plan = Plan.new name, @description, @filename
           @description = nil
           @plans << plan
-          plan.add_children DSL.new(&block).plans
+          plan.add_children DSL.new(@filename, &block).plans
         end
         alias_method :namespace, :plot
 
@@ -38,7 +42,7 @@ module CLI::Mastermind
         alias_method :desc, :description
 
         def plan(name, &block)
-          @plans << Plan.new(name, @description, &block)
+          @plans << Plan.new(name, @description, @filename, &block)
           @description = nil
         end
         alias_method :task, :plan

data/lib/cli/mastermind/plan.rb

@@ -16,6 +16,9 @@ module CLI
       # Used in the interactive plan selector to display child plans
       attr_reader :children
 
+      # The file this plan was loaded from, if any
+      attr_reader :filename
+
       # Loads a particular plan from the filesystem.
       # @see Loader
       def self.load(filename)
@@ -24,9 +27,10 @@ module CLI
         loader.load(filename)
       end
 
-      def initialize(name, description=nil, &block)
+      def initialize(name, description=nil, filename=nil, &block)
         @name = name.to_s.freeze
         @description = description.freeze
+        @filename = filename
         @block = block
         @children = {}
       end
@@ -39,8 +43,8 @@ module CLI
       alias_method :dig, :get_child
 
       def add_children(plans)
-        raise 'Cannot add child plans to a plan with an action', InvalidPlanError unless @block.nil?
-        plans.each { |plan| @children[plan.name] = plan }
+        raise InvalidPlanError, 'Cannot add child plans to a plan with an action' unless @block.nil?
+        plans.each(&method(:incorporate_plan))
       end
 
       def has_children?
@@ -56,6 +60,31 @@ module CLI
 
       private
 
+      def incorporate_plan(plan)
+        # If this namespace isn't taken just add the plan
+        if @children.has_key? plan.name
+
+          # Otherwise, we need to handle a name collision
+          existing_plan = @children[plan.name]
+
+          # If both plans have children, we merge them together
+          if existing_plan.has_children? and plan.has_children?
+            existing_plan.add_children plan.children.values
+
+            return existing_plan
+          end
+
+          # Otherwise, the plan defined later wins and overwrites the existing plan
+          warn <<~PLAN_COLLISON.strip
+                 Plan name collision encountered when loading plans from "#{plan.filename}" that cannot be merged.
+                 "#{plan.name}" was previously defined in "#{existing_plan.filename}".
+                 Plans from "#{plan.filename}" will be used instead.
+               PLAN_COLLISON
+        end
+
+        @children[plan.name] = plan
+      end
+
       # Delegate configuration to the top-level configuration object
       def_delegator :'CLI::Mastermind', :configuration
       alias_method :config, :configuration

data/lib/cli/mastermind/version.rb

@@ -8,7 +8,7 @@ module CLI
     module VERSION
       RELEASE = 0
       MAJOR = 0
-      MINOR = 2
+      MINOR = 3
       PATCH = nil
 
       STRING = [RELEASE, MAJOR, MINOR, PATCH].compact.join('.').freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cli-mastermind
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Chris Hall
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cli-ui
@@ -70,17 +70,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".masterplan"
-- ".rspec"
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
-- bin/console
-- bin/rspec
-- bin/setup
-- cli-mastermind.gemspec
 - exe/mastermind
 - lib/cli/mastermind.rb
 - lib/cli/mastermind/arg_parse.rb
@@ -91,8 +82,6 @@ files:
 - lib/cli/mastermind/loader/planfile_loader.rb
 - lib/cli/mastermind/plan.rb
 - lib/cli/mastermind/version.rb
-- plans/gem.plan
-- plans/sample.plan
 homepage: https://github.com/chall8908/cli-mastermind
 licenses:
 - MIT

data/.gitignore

@@ -1,11 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status

data/.masterplan

@@ -1,6 +0,0 @@
-#-*- ruby -*-
-at_project_root
-
-has_plan_files
-
-configure(:gemspec) { Gem::Specification.load('cli-mastermind.gemspec') }

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/Gemfile

@@ -1,12 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-#ruby=ruby-2.5.1
-#ruby-gemset=cli-mastermind
-
-# Specify your gem's dependencies in cli-mastermind.gemspec
-gemspec
-
-gem 'pry'
-gem 'pry-byebug'

data/Gemfile.lock

@@ -1,46 +0,0 @@
-PATH
-  remote: .
-  specs:
-    cli-mastermind (0.0.1)
-      cli-ui (~> 1.2, >= 1.2.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    byebug (10.0.2)
-    cli-ui (1.2.1)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    method_source (0.9.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  cli-mastermind!
-  pry
-  pry-byebug
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.2

data/bin/console

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "cli/mastermind"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-require "pry"
-require 'pry-byebug'
-Pry.start

data/bin/rspec

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-
-if File.file?(bundle_binstub)
-  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
-    load(bundle_binstub)
-  else
-    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
-Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
-  end
-end
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/cli-mastermind.gemspec

@@ -1,34 +0,0 @@
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "cli/mastermind/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "cli-mastermind"
-  spec.version       = CLI::Mastermind.gem_version
-  spec.authors       = ["Chris Hall"]
-  spec.email         = ["chall8908@gmail.com"]
-
-  spec.summary       = "Mastermind is a library for constructing command line toolboxes."
-  spec.description   = <<-DESC
-                         Take over the world from your command line!
-                         With mastermind, you can quickly build and generate
-                         command line toolkits without having to custom build
-                         everything for every project.
-                       DESC
-  spec.homepage      = "https://github.com/chall8908/cli-mastermind"
-  spec.license       = "MIT"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency "cli-ui", "~> 1.2", ">= 1.2.1"
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rspec", "~> 3.0"
-end

data/plans/gem.plan

@@ -1,39 +0,0 @@
-#-*- ruby -*-
-plot :gem do
-  description 'Builds the mastermind gem'
-  # NOTE: The Gem::Package interface doesn't appear to be completely stable.
-  #       This may only work on version 2.7.7 of RubyGems, though other versions
-  #       seem to support passing only a spec as I'm doing here.
-  plan :build do
-    Dir.mkdir 'pkg' unless Dir.exists? 'pkg'
-
-    require 'rubygems/package'
-    spec = config.gemspec
-
-    Gem::Package.build(spec)
-
-    File.write(File.join('pkg', spec.file_name), File.read(spec.file_name), mode: ?w)
-    File.delete(spec.file_name)
-  end
-
-  description 'Install mastermind into the local system'
-  plan :install do
-    require 'rubygems/installer'
-    config.plans['gem']['build'].call
-
-    Gem::Installer.at(File.join('pkg', config.gemspec.file_name)).install
-  end
-
-  description 'Package and push a new release'
-  plan :release do
-    config.plans['gem']['build'].call
-    spec = config.gemspec
-
-    `git tag '#{spec.version}'`
-    `git push origin HEAD`
-    `git push --tags`
-
-    require 'rubygems/command_manager'
-    Gem::CommandManager.instance['push'].invoke File.join('pkg', spec.file_name)
-  end
-end

data/plans/sample.plan

@@ -1,17 +0,0 @@
-#-*- ruby -*-
-# aliased as `namespace` for a less fanciful, rake-like way of doing things
-plot :top_level do
-
-  # aliased as `desc` if you prefer brevity
-  description 'This is the description of the next plan defined'
-  # aliased as `task`, for a less fanciful, rake-like way of doing things
-  plan :child_plan do |arguments|
-    puts 'EXECUTING'
-    puts arguments
-  end
-
-  description 'This is another plan under the top_level plan'
-  plan :second_child do
-    # more tasks
-  end
-end