turple 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 085546359d95c95a2ff9606bb32064200bc47932
-  data.tar.gz: 15530e590730ead076deed65817663344ca45a5a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmZhYWE4ZDVkOWIwYTc0ZTJmZmUwYWYyNzY2MmQ1ZmZhMmFmZTg3ZA==
+  data.tar.gz: !binary |-
+    Yzg5ODBiYzc1ZDQ5MGRmYTA0N2M3OGM0MzBkMmYwMTg4NTYzNDBiOA==
 SHA512:
-  metadata.gz: 44c35d882b0707901ec0cde574f906862efbddcc4c17f4c8e02ade91d167781918e3439ccb6a3eb9d5e1e914e5e785f35244ead47b370fcbce2b3889182cf242
-  data.tar.gz: dcb66d642ab9d988c66fb8204bb79308e3c12fe7ee812c554142dde958d7ad9b299b627818a3ce6aab29883a30c27cd128e1c3cefce596001105c058639927d6
+  metadata.gz: !binary |-
+    YWRhMDZmNjBjZDIxYzJjNWY4YWE0Mzk4NDM2YjViNTk4M2Y1MmJiMjhhN2U0
+    ZmQyMDk2YTYxMTU5OWY3YzgzM2VlMWUyOGQ1OGFmMWU3NjZlMjM3OGYzOGQ2
+    ZjdmODFiNzQyNTZmMTY5YjgzYTljMzhlN2Q1NDY0NDkzNzM3YzU=
+  data.tar.gz: !binary |-
+    OGYzNjg3MzkyZTI2ZGQ5NGFmMmU0NjcxNWEyODk1NzA2OGRjMjM2NWJkM2Zl
+    ZjI5N2FlMDk0NGY5ZmY3MGMyMGU3Mjc4NTI1ZjIzODczNDViYjc0MGJmM2M3
+    MjliYmI1NmQwMzdkYTM2MWJkN2M2NTM2MjUwOTI0M2UzMzdiYWQ=

data/.gitignore

@@ -1,3 +1,4 @@
+.ruby-version
 .yardoc
 coverage
 tmp

data/Gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'activesupport', '~> 4.1'
 gem 'cli_miami', '~> 0.0'
-gem 'colorize', '~> 0.7'
 gem 'coveralls', '~> 0.7', :require => false
 gem 'recursive-open-struct', '~> 0.5'
 gem 'sourcerer_', '~> 0.0', :require => 'sourcerer'

data/Gemfile.lock

@@ -14,7 +14,6 @@ GEM
     cli_miami (0.0.6)
       term-ansicolor (~> 1.3)
     coderay (1.1.0)
-    colorize (0.7.5)
     coveralls (0.7.1)
       multi_json (~> 1.3)
       rest-client
@@ -103,7 +102,6 @@ PLATFORMS
 DEPENDENCIES
   activesupport (~> 4.1)
   cli_miami (~> 0.0)
-  colorize (~> 0.7)
   coveralls (~> 0.7)
   guard (~> 2.6)
   guard-rspec (~> 4.3)

data/lib/turple.rb

@@ -1,6 +1,8 @@
 require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/hash/keys'
 require 'cli_miami'
+require 'sourcerer'
+require 'tmpdir'
 require 'yaml'
 
 class Turple
@@ -8,41 +10,26 @@ class Turple
   require 'turple/cli'
   require 'turple/data'
   require 'turple/interpolate'
+  require 'turple/source'
   require 'turple/template'
 
-  # Create CLI Miami presets
-  @@line_size = 80
-  CliMiami.set_preset :error, {
-    :color => :red,
-    :style => :bold
-  }
-  CliMiami.set_preset :prompt, {
-    :color => :blue,
-    :style => :bright
-  }
-  CliMiami.set_preset :header, CliMiami.presets[:prompt].merge({
-    :justify => :center,
-    :padding => @@line_size
-  })
-  CliMiami.set_preset :key, CliMiami.presets[:prompt].merge({
-    :justify => :rjust,
-    :padding => @@line_size / 2,
-    :preset => :prompt,
-    :newline => false
-  })
-  CliMiami.set_preset :value, {
-    :indent => 1
-  }
-
-  # Allows Turple.ate vs Turple.new
-  class << self
-    alias_method :ate, :new
-  end
+  # Turple internal configuration
+  CLI_LINE_LENGTH = 80
 
+  # Turple user configuration defaults
   @@turpleobject = {
     :template => '',
     :data => {},
     :data_map => {},
+
+    # default sources to download
+    :sources => {
+      :default => 'brewster1134/turple-templates'
+    },
+
+    # default destination
+    :destination => File.join(Dir.pwd, 'turple'),
+
     :configuration => {
       # default regex for file names to interpolate content of
       # matches files with an extension of `.turple`
@@ -73,6 +60,38 @@ class Turple
     }
   }
 
+  # CLI Miami
+  # presets
+  #
+  CliMiami.set_preset :error, {
+    :color => :red,
+    :style => :bold
+  }
+  CliMiami.set_preset :prompt, {
+    :color => :blue,
+    :style => :bright
+  }
+  CliMiami.set_preset :header, CliMiami.presets[:prompt].merge({
+    :justify => :center,
+    :padding => CLI_LINE_LENGTH
+  })
+  CliMiami.set_preset :key, CliMiami.presets[:prompt].merge({
+    :justify => :rjust,
+    :padding => CLI_LINE_LENGTH / 2,
+    :preset => :prompt,
+    :newline => false
+  })
+  CliMiami.set_preset :value, {
+    :indent => 1
+  }
+
+  attr_reader :sources
+
+  # Allows Turple.ate vs Turple.new
+  class << self
+    alias_method :ate, :new
+  end
+
   # Get loaded turplefiles contents
   # @return [Hash]
   #
@@ -90,27 +109,45 @@ class Turple
   # @return [Hash]
   #
   def self.load_turplefile turplefile_path
-    # return false if file doesnt exist
     turplefile_path = File.expand_path turplefile_path
+
+    # return false if file doesnt exist
     return false unless File.exists? turplefile_path
 
     self.turpleobject = YAML.load File.read turplefile_path
   end
 
   # Add additional data to the collective turplefile
+  #
   # @param hash [Hash] any hash of data to be merged into existing turplefile data
   # @return [Hash] merged turplefile data with symbolized keys
+  #
   def self.turpleobject= hash
     @@turpleobject.deep_merge! hash.deep_symbolize_keys
   end
 
 private
 
-  def initialize template_path, data_hash, configuration_hash
+  def initialize template_path, data_hash = {}, configuration_hash = {}
     data_hash = Turple.data.deep_merge data_hash
     data_map_hash = Turple.data_map
     configuration_hash = Turple.configuration.deep_merge configuration_hash
-    @destination_path = configuration_hash[:destination]
+    @destination_path = Turple.destination
+
+    # load Turplefiles in order...
+    # home, template, destination
+    [
+      '~',
+      template_path,
+      @destination_path
+    ].each do |path|
+      Turple.load_turplefile File.join(File.expand_path(path), 'Turplefile')
+    end
+
+    # create turplefile sources
+    Turple.sources.each do |source_name, source_path|
+      Turple::Source.new source_name, source_path
+    end
 
     if configuration_hash[:cli]
       S.ay 'Saving to: ', :preset => :prompt, :newline => false
@@ -126,9 +163,9 @@ private
   end
 
   def output_summary
-    S.ay '=' * @@line_size, :prompt
+    S.ay '=' * CLI_LINE_LENGTH, :prompt
     S.ay '!TURPLE SUCCESS!', :preset => :header
-    S.ay '=' * @@line_size, :prompt
+    S.ay '=' * CLI_LINE_LENGTH, :prompt
 
     S.ay 'Turpleated ', :newline => false, :indent => 2
     S.ay @template.name, :newline => false, :preset => :prompt
@@ -139,6 +176,6 @@ private
     S.ay Dir[File.join(@destination_path, '**/*')].count.to_s, :value
     S.ay 'Turpleated in:', :key
     S.ay (@interpolate.time * 1000).round(1).to_s + 'ms', :value
-    S.ay '=' * @@line_size, :prompt
+    S.ay '=' * CLI_LINE_LENGTH, :prompt
   end
 end

data/lib/turple/cli.rb

@@ -1,27 +1,21 @@
-require 'cli_miami'
 require 'thor'
 
 class Turple::Cli < Thor
-  desc 'ate', 'Interpolate your template!'
-  option :template, :type => :string, :desc => 'Path to a turple template.'
-  option :destination, :type => :string, :default => File.join(Dir.pwd, 'turple'), :desc => 'Path to save interpolated template to.'
+  desc 'ate', 'Interpolate a template!'
+  option :template, :type => :string, :aliases => ['-t'], :desc => 'Path to, or name of, a turple template.'
+  option :destination, :type => :string, :aliases => ['-d'], :desc => 'Path to save interpolated template to.'
   def ate
-    destination = File.expand_path options['destination']
-
-    # load destination turplefile if it exists
-    Turple.load_turplefile File.join(destination, 'Turplefile')
-
     # update turpleobject object with cli options
     Turple.turpleobject = {
-      template: (options['template'] || Turple.template rescue nil),
+      template: options['template'] || Turple.template,
+      destination: options['destination'] || Turple.destination,
       configuration: {
-        destination: destination,
         cli: true
       }
     }
 
     # initialize turple
-    Turple.ate Turple.template, Turple.data, Turple.configuration
+    Turple.ate Turple.template
   end
 
   default_task :ate

data/lib/turple/interpolate.rb

@@ -8,10 +8,10 @@ class Turple::Interpolate
 private
 
   def initialize template, data, destination
-    @template = template.path
+    @template = template
     @data = data.data
     @destination = destination
-    @configuration = template.configuration
+    @configuration = template.configuration.to_hash
     @tmp_dir = Dir.mktmpdir
     @project_name = File.basename @destination
 
@@ -36,9 +36,9 @@ private
   # Copy template to tmp dir and get the new path
   #
   def create_tmp_project!
-    FileUtils.cp_r @template, @tmp_dir
+    FileUtils.cp_r @template.path, @tmp_dir
 
-    @tmp_project = File.join(@tmp_dir, File.basename(@template))
+    @tmp_project = File.join(@tmp_dir, File.basename(@template.path))
   end
 
   # Collect paths to interpolate
@@ -145,7 +145,7 @@ private
     # get new template name based on the first directory of the destination
     turplefile_path = File.join(@destination, 'Turplefile')
     turplefile_object = Turple.turpleobject.deep_merge({
-      template: @template,
+      template: @template.original_path,
       :created_on => Date.today.to_s
     })
 

data/lib/turple/source.rb

@@ -0,0 +1,63 @@
+require 'sourcerer'
+
+class Turple::Source
+  attr_reader :template_paths
+
+  # find a template from multiple sources (unless one is specified)
+  #
+  # @param template_name [String] template name generated from the folder name
+  # @param source_name [String] source name provided from the user's Turplefile
+  #
+  # @return [String] path to the desired template
+  #
+  def self.find_template_path template_name, source_name = nil
+    # if source is specified, target it directly
+    if source_name
+      return @@sources[source_name].template_paths[template_name]
+
+    # otherwise loop through sources until a template is found
+    else
+      @@sources.values.each do |source|
+        return source.template_paths[template_name] || next
+      end
+    end
+
+    return nil
+  end
+
+private
+
+  @@sources = {}
+
+  def initialize source_name, source_path
+    @template_paths = {}
+    @source = Sourcerer.new(source_path)
+
+    add_templates @source.destination
+
+    # add new source to hash
+    @@sources[source_name] = self
+  end
+
+  # search through source and add any directory with a Turplefile as a turple template
+  #
+  # @param source_path [String] a path to a source.  this will be a generated tmp dir from Sourcerer
+  #
+  def add_templates source_path
+    @source.files('**/Turplefile').each do |turplefile_path|
+      template_path = File.dirname(turplefile_path)
+      template_name = File.basename(template_path)
+
+      add_template template_name, template_path
+    end
+  end
+
+  # add a template path to the instance var
+  #
+  # @param template_name [String]
+  # @param template_path [String]
+  #
+  def add_template template_name, template_path
+    @template_paths[template_name] = template_path
+  end
+end

data/lib/turple/template.rb

@@ -4,56 +4,30 @@ require 'find'
 require 'sourcerer'
 
 class Turple::Template
-  attr_accessor :path, :required_data, :configuration, :name
-
-  # character used to split a remote source from a template name
-  SOURCE_SPLITTER = '|'
+  SOURCE_TEMPLATE_SPLITTER = '##'
+  attr_accessor :configuration, :name, :original_path, :path, :required_data
 
 private
 
   def initialize path, configuration
-    @path = get_path path
+    @original_path = path
     @configuration = configuration
 
-    # validate template path
-    unless valid_path?
+    # validate configuration and path
+    valid_configuration?
+    unless valid_path? path
       if @configuration[:cli]
         prompt_for_path
       else
-        raise S.ay "Invalid Path `#{@path}`", :error
+        raise S.ay "Invalid Template Path `#{path}`", :error
       end
     end
 
-    # load template turplefile after validating path
-    Turple.load_turplefile File.join(@path, 'Turplefile')
-
-    # validate configuration after loading turplefile
-    valid_configuration?
-
     # set data variables after validating path and configuration
     @required_data = scan_for_data @path
     @name = Turple.turpleobject[:name] || File.basename(@path)
   end
 
-  # process path for possible a remote source
-  # use Sourcerer to download source
-  #
-  # @param path [String] template path
-  # @return [String] valid path to local directory containing template
-  #
-  def get_path path
-    # detect a remote source
-    if path.include? SOURCE_SPLITTER
-      source_template = path.split SOURCE_SPLITTER
-      source = Sourcerer.new source_template[0]
-      template = source_template[1]
-
-      File.join(source.destination, template)
-    else
-      return File.expand_path path
-    end
-  end
-
   # Scan a path and determine the required data needed to interpolate it
   # @param template_path [String] path to a template file
   # @return [Hash] a hash of all the data needed
@@ -103,20 +77,48 @@ private
   # check that the path is a valid template
   # @return [Boolean]
   #
-  def valid_path?
-    File.exists?(@path) && File.exists?(File.join(@path, 'Turplefile'))
+  def valid_path? potential_path
+    # with source included in template path...
+    new_path = if potential_path.include? SOURCE_TEMPLATE_SPLITTER
+      # split source from template
+      source_template = potential_path.split SOURCE_TEMPLATE_SPLITTER
+
+      # create new source
+      begin
+        Turple::Source.new source_template[1], source_template[0]
+      rescue
+        return false
+      end
+
+      # look up template path from new source
+      Turple::Source.find_template_path source_template[1], source_template[1]
+
+    # if just the template name/path is passed...
+    else
+      # check for template name in existing sources or treat it as a local path
+      Turple::Source.find_template_path(potential_path) || File.expand_path(potential_path)
+    end
+
+    # set path var if new path is a valid template
+    if !new_path.nil? && File.directory?(new_path) && File.file?(File.join(new_path, 'Turplefile'))
+      @path = new_path
+      return true
+    else
+      return false
+    end
   end
 
   # prompt the user for a template path until a vaid one is entered
   # @return [String] valid template path
   #
   def prompt_for_path
-    until valid_path?
+    until @path
       A.sk 'Enter a path to a Turple Template', :preset => :prompt, :readline => true do |response|
-        @path = File.expand_path response
+        valid_path? response
       end
     end
-    @path
+
+    return @path
   end
 
   # check the configuration is valid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turple
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Ryan Brewster
@@ -14,154 +14,140 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: cli_miami
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: recursive-open-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: sourcerer_
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 description: 
@@ -171,9 +157,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -183,6 +169,7 @@ files:
 - lib/turple/cli.rb
 - lib/turple/data.rb
 - lib/turple/interpolate.rb
+- lib/turple/source.rb
 - lib/turple/template.rb
 - yuyi_menu
 homepage: https://github.com/brewster1134/turple
@@ -195,19 +182,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Quick Project Templating
 test_files: []
-has_rdoc: