ngi 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 119801cbccb57371891100b9178b947823859d00
-  data.tar.gz: b129e85c5cc365c3e4fc2f2672fe1c0e40ca7506
+  metadata.gz: c3e2d5d2fceb01e3e06c14c3580561bd3a15329f
+  data.tar.gz: 3fa569d585f690a60ee5bb6c52567620d167310b
 SHA512:
-  metadata.gz: 255746a7d8b4dcf7c23f38cae6829adba8631860c9c8da90c48583ffd446889c541f362456d5237d3a2c63c1b51f7084832b37439610f39d907f9492bce3ac19
-  data.tar.gz: e6fd90484636fc1a66ec48dfe7082022c8f80795edf6538701af40fa68cbaebea07ae53a3b72723a0820ab01fa3409f54249056efeefbd554315bc90e7b4ad03
+  metadata.gz: 114412c6662f27aebef62423bdf4d91b9b4bafec03b4938fefa9789470e44f4c1ffda7f9468c1e2072b85113bf91421ced34add0dd39587ff0fdeb024b5f8bce
+  data.tar.gz: 5dc112cf93b96791658c9100656d3c0f37513bab2f49c68a67e87e7b9a7b375c10b7cbd1ea45598587caa3dc67da3a6e4cba6e22546dbdbe774c36b4fe0b6825

data/README.md

@@ -1,8 +1,26 @@
-# angular_init 0.2.0
+# angular_init 0.2.2
+
+## Quick Start
+
+ngi creates AngularJS templates for you from the command line.
+
+**Get up and running in seconds:**
+
+[![Gem Version](https://badge.fury.io/rb/ngi.svg)](http://badge.fury.io/rb/ngi)
+
+```shell
+$ gem install ngi
+$ cd ~/MyAwesomeApp # => go to your app
+$ ngi controller # => creates a new AngularJS controller
+```
+
+## Know everything
 
 <a href="http://joshbeam.github.io/angular_init">Website</a>
 
-**What's different?**
+**Having issues?** Email me (Josh) at <a href="mailto:frontendcollisionblog@gmail.com">frontendcollisionblog@gmail.com</a>. I'll usually respond within an hour or so. You can also report a bug by opening a new issue through GitHub, or if you want to add a feature yourself, just fork and submit a pull request!
+
+**What's new in 0.2.x?**
 - Install it as a gem (`gem install ngi`)
 - You can now make an `index` boilerplate HTML page (`ngi index`)
 - Use `ngi -h` to see all commands
@@ -46,7 +64,7 @@ After you [do the 1-step installation][install] of `ngi` (the short-name for the
 # all done!
 ```
 
-## Output (your new boilerplate code)
+## Output (new boilerplate code)
 
 ```javascript
 // ~/MyAwesomeApp/myAwesome.controller.js
@@ -78,6 +96,7 @@ By the way, the output of this little tool is meant to follow [John Papa's Angul
 ## Coming soon
 
 - Add custom templates and languages
+- Possible Node.js version
 
 Feel free to fork the project or get <a href="http://frontendcollisionblog.com/about">in touch with Josh (me)</a> with any feature requests!
 
@@ -142,7 +161,7 @@ The command line tool itself is written in <a href="https://www.ruby-lang.org/en
 
 # Technical Information
 
-**Version** 0.2.0
+**Version** 0.2.2 (uses <a href="http://semver.org/">Semantic Versioning</a>)
 
 **Language** Ruby
 
@@ -150,7 +169,32 @@ The command line tool itself is written in <a href="https://www.ruby-lang.org/en
 
 <hr>
 
-&copy; 2015 Joshua Beam (MIT License) &mdash; <a href="http://frontendcollisionblog.com">Front End Collision</a>
+**Disclaimer**
+
+`angular_init` and `ngi` and the author (Joshua Beam) are not directly associated with <a href="http://angularjs.org">AngularJS</a>.
+
+**Copyright (c) 2015 Joshua Beam** &mdash; <a href="http://frontendcollisionblog.com">Front End Collision</a>
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 [install]: #installation-in-1-step
 [sample-usage]: #sample-usage

data/bin/ngi

@@ -9,27 +9,30 @@
 require_relative '../lib/ngi'
 require_relative '../lib/ngi/utils/utils'
 
+# This class is just a wrapper for the main process
+# of ngi
 class Parser
-	@@config = Ngi::Delegate::Configure.new.from_json
-	@@types = Ngi::UserInput.new(valid_inputs: @@config['global']['components'].collect{ |t| t['name'] })
-
-	def self.parse(args)
-		parser = Utils::CommandParser.new do |parser|
-			parser.name = "ngi"
-			parser.version = Ngi::VERSION
-			parser.banner << "\n(<command> can be one of the following)"
-
-			parser.on(@@types.valid_inputs, "Create a new component") do |command|
-				Ngi::Delegate::Generator.run(type: command, config: @@config)
-			end
-
-			parser.on(["-o","--options"], "Configure ngi") do
-				Ngi::Delegate::Configure.run()
-			end
-		end
-
-		parser.parse(args)
-	end
+  def self.parse(args)
+    p = Utils::CommandParser.new do |parser|
+      config = Ngi::Delegate::Configure.new.from_json
+      components = config['global']['components'].collect { |t| t['name'] }
+      types = Ngi::UserInput.new(valid_inputs: components)
+
+      parser.name = 'ngi'
+      parser.version = Ngi::VERSION
+      parser.banner << "\n(<command> can be one of the following)"
+
+      parser.on(types.valid_inputs, 'Create a new component') do |command|
+        Ngi::Delegate::Generator.run(type: command, config: config)
+      end
+
+      parser.on(['-o', '--options'], 'Configure ngi') do
+        Ngi::Delegate::Configure.run
+      end
+    end
+
+    p.parse(args)
+  end
 end
 
-Parser.parse(ARGV)
+Parser.parse(ARGV)

data/lib/ngi.rb

@@ -5,12 +5,15 @@
 
 CURRENT_DIR = File.dirname(__FILE__)
 
-require_relative "ngi/delegate"
-require_relative "ngi/utils/utils"
-require_relative "ngi/version"
+require_relative 'ngi/delegate'
+require_relative 'ngi/utils/utils'
+require_relative 'ngi/version'
 
+# This module wraps the basic classes
+# of the tool ngi (in other words, this
+# module simply provides namespace)
 module Ngi
-	# REVIEW: Is this the best way to do it?
-	Delegate = ::Delegate
-	UserInput = ::Utils::UserInput
-end
+  # REVIEW: Is this the best way to do it?
+  Delegate = ::Delegate
+  UserInput = ::Utils::UserInput
+end

data/lib/ngi/configure.rb

@@ -5,161 +5,156 @@
 
 # CURRENT_DIR is defined in angualr_init.rb
 
-# require CURRENT_DIR+'/../../../lib/json'
-# require CURRENT_DIR+'/../utils/utils'
-
-require_relative '../dep/json'
+# require_relative '../dep/json'
+require 'json'
 require_relative 'utils/utils'
 
+# Run the user through an interactive
+# session of configuring ngi
 class Configure
-	attr_accessor :file, :location
-
-	Utils = ::Utils
-	JSArray = Utils::JSArray
-	JSHash = Utils::JSHash
-
-	# Make Questioner accesible as in: Configure::Questioner.run()
-	# "Questioner" simply starts an interactive prompt to guide
-	# the user in configuring src/config/agular_init.config.json,
-	# which is a JSON file that holds all the global configurable
-	# options (like language to use, templates, etc.)
-	class Questioner
-		attr_accessor :file
-
-		def initialize(file)
-			@file = file
+  attr_accessor :file, :location
 
-			@GLOBAL = @file['global']
-			# TODO: extend array with this inject function?
+  Utils = ::Utils
+  JSArray = Utils::JSArray
+  JSHash = Utils::JSHash
 
-			# The options for languages to use
-			@LANGUAGES = @GLOBAL['languages']
+  # Make Questioner accesible as in: Configure::Questioner.run()
+  # "Questioner" simply starts an interactive prompt to guide
+  # the user in configuring src/config/agular_init.config.json,
+  # which is a JSON file that holds all the global configurable
+  # options (like language to use, templates, etc.)
+  class Questioner
+    attr_accessor :file
 
-			# The properties in key => value format of the properties the user can configure
-			@CONFIGURABLE = @GLOBAL['configurable']
+    def initialize(file)
+      @file = file
 
-			# An array of the properties that the user is allowed to configure,
-			# according to src/config/angular_init.config.json
-			@CONFIGURABLE_PROPERTIES = @CONFIGURABLE.collect{ |k,v| v }
+      @GLOBAL = @file['global']
+      # TODO: extend array with this inject function?
 
-			if block_given?
-				yield(self)
-			end
-		end
+      # The options for languages to use
+      @LANGUAGES = @GLOBAL['languages']
 
-		def choose_configurable_property
-			line_break = "\n------------------"
+      # The properties in key => value format of the properties the user can configure
+      @CONFIGURABLE = @GLOBAL['configurable']
 
-			puts "\nCurrent settings #{line_break}"
-			@CONFIGURABLE.each_with_index do | (k,v),i |
-				puts "#{i+1}) "+v.capitalize+": "+JSHash.new(@GLOBAL[v]).to_str
-			end
+      # An array of the properties that the user is allowed to configure,
+      # according to src/config/angular_init.config.json
+      @CONFIGURABLE_PROPERTIES = @CONFIGURABLE.collect { |_k, v| v }
 
-			# return
-			AskLoop.ask(:check => @CONFIGURABLE_PROPERTIES, :valid => JSArray.new(@CONFIGURABLE_PROPERTIES).to_str)
-		end
+      yield(self) if block_given?
+    end
 
-		def configure_property(property)
-			case property
-			when @CONFIGURABLE['language']
-				language_types = @LANGUAGES.collect{|type,languages| type if languages.size > 1 }.reject{|t| t.nil?}
+    def choose_configurable_property
+      line_break = "\n------------------"
 
-				type = AskLoop.ask(:check => language_types, :valid => JSArray.new(language_types).to_str)
+      puts "\nCurrent settings #{line_break}"
+      @CONFIGURABLE.each_with_index do |(_k, v), i|
+        puts "#{i + 1}) " + v.capitalize + ': ' + JSHash.new(@GLOBAL[v]).to_str
+      end
 
-				language_opts = @LANGUAGES.reject{|t,languages| languages if t != type}[type].reject{|l| l == @GLOBAL['language'][type]}
+      # return
+      AskLoop.ask(check: @CONFIGURABLE_PROPERTIES, valid: JSArray.new(@CONFIGURABLE_PROPERTIES).to_str)
+    end
 
-				language = AskLoop.ask(:check => language_opts, :valid => JSArray.new(language_opts).to_str)
+    def configure_property(property)
+      case property
+      when @CONFIGURABLE['language']
+        language_types = @LANGUAGES.collect { |type, languages| type if languages.size > 1 }.reject(&:nil?)
 
-				answer = @GLOBAL['language']
+        type = AskLoop.ask(check: language_types, valid: JSArray.new(language_types).to_str)
 
-				answer[type] = language
-			end
+        language_opts = @LANGUAGES.reject { |t, languages| languages if t != type }[type].reject { |l| l == @GLOBAL['language'][type] }
 
-			# TODO: add ability to add templates
+        language = AskLoop.ask(check: language_opts, valid: JSArray.new(language_opts).to_str)
 
-			answer
-		end
+        answer = @GLOBAL['language']
 
+        answer[type] = language
+      end
 
-		def self.run(file)
-			q = Questioner.new(file) do |q|
-				configurable_property = q.choose_configurable_property
+      # TODO: add ability to add templates
 
-				result = q.configure_property(configurable_property)
+      answer
+    end
 
-				q.file['global'][configurable_property] = result
+    def self.run(file)
+      questioner = Questioner.new(file) do |q|
+        configurable_property = q.choose_configurable_property
 
-				puts configurable_property.capitalize+' set to: '+JSHash.new(result).to_str
-			end
+        result = q.configure_property(configurable_property)
 
-			q.file
-		end
-	end
+        q.file['global'][configurable_property] = result
 
-	# Here, we implement the virtual class "Utils::AskLoop"
-	# (see src/ruby/utils/utils.rb)
-	# This implementation just creates a loop that asks
-	# for user input
-	class AskLoop < Utils::AskLoop
-		def self.ask(args)
-			puts "\n"
-			puts 'Choose from: '+args[:valid]
+        puts configurable_property.capitalize + ' set to: ' + JSHash.new(result).to_str
+      end
 
-			answer = $stdin.gets.strip
+      questioner.file
+    end
+  end
 
-			while true
-				if args[:check].include?(answer)
-					break
-				else
-					puts 'Choose from: '+args[:valid]
-					puts '(or press ctrl+c to exit)'
-					answer = $stdin.gets.strip
-				end
-			end
+  # Here, we implement the virtual class "Utils::AskLoop"
+  # (see src/ruby/utils/utils.rb)
+  # This implementation just creates a loop that asks
+  # for user input
+  class AskLoop < Utils::AskLoop
+    def self.ask(args)
+      puts "\n"
+      puts 'Choose from: ' + args[:valid]
 
-			answer
-		end
-	end
+      answer = $stdin.gets.strip
 
-	# The only thing we do here is load the JSON config file basically
-	# as just a string in JSON format.
-	# It will be converted to a Ruby hash in from_json below
-	def initialize
-		@location = CURRENT_DIR+'/config/angular_init.config.json'
-		@file = IO.read(@location)
+      loop do
+        if args[:check].include?(answer)
+          break
+        else
+          puts 'Choose from: ' + args[:valid]
+          puts '(or press ctrl+c to exit)'
+          answer = $stdin.gets.strip
+        end
+      end
 
-		if block_given?
-			yield(self)
-		end
-	end
+      answer
+    end
+  end
 
-	# Convert the file to a Ruby hash
-	def from_json
-		JSON.parse(@file)
-	end
+  # The only thing we do here is load the JSON config file basically
+  # as just a string in JSON format.
+  # It will be converted to a Ruby hash in from_json below
+  def initialize
+    @location = CURRENT_DIR + '/config/angular_init.config.json'
+    @file = IO.read(@location)
 
-	# Generate a "prettified" JSON version of our
-	# newly updated Ruby hash with the user's options
-	def to_json
-		JSON.pretty_generate(@file)
-	end
-
-	# Here we actually write the new JSON config file
-	# to src/config/angular_init.config.json
-	def write
-		new_file = to_json
+    yield(self) if block_given?
+  end
 
-		File.open(@location,'w') do |f|
-			f.write(new_file)
-			f.close
-		end
-	end
+  # Convert the file to a Ruby hash
+  def from_json
+    JSON.parse(@file)
+  end
 
-	def self.run
-		Configure.new do |c|
-			c.file = Configure::Questioner.run(c.from_json)
+  # Generate a "prettified" JSON version of our
+  # newly updated Ruby hash with the user's options
+  def to_json
+    JSON.pretty_generate(@file)
+  end
+
+  # Here we actually write the new JSON config file
+  # to src/config/angular_init.config.json
+  def write
+    new_file = to_json
 
-			c.write
-		end
-	end
-end
+    File.open(@location, 'w') do |f|
+      f.write(new_file)
+      f.close
+    end
+  end
+
+  def self.run
+    Configure.new do |c|
+      c.file = Configure::Questioner.run(c.from_json)
+
+      c.write
+    end
+  end
+end

data/lib/ngi/delegate.rb

@@ -16,9 +16,7 @@ require_relative 'configure'
 # the flow of control to either the Generator class
 # or the Configure class, based on the argument passed
 # in (which is handled by bin/ngi)
-
 class Delegate
-	# Review: is this the best way to do it?
-	Generator = ::Generator
-	Configure = ::Configure
-end
+  Generator = ::Generator
+  Configure = ::Configure
+end

data/lib/ngi/generator.rb

@@ -3,197 +3,191 @@
 # github.com/joshbeam/angular_init
 # MIT License
 
-require_relative "utils/utils"
+require_relative 'utils/utils'
 
 # This class generates templates (hence the name "Generator")
 class Generator
-	Utils = ::Utils
+  Utils = ::Utils
 
-	class AskLoop < Utils::AskLoop
-		def self.ask(args)
-			puts "\n"
-			print args[:prompt]
+  class AskLoop < Utils::AskLoop
+    def self.ask(args)
+      puts "\n"
+      print args[:prompt]
 
-			answer = $stdin.gets.strip.downcase
+      answer = $stdin.gets.strip.downcase
 
-			while true
-				if args[:check] == answer
-					break
-				else
-					puts "Exited!"
-					exit
-				end
-			end
+      loop do
+        if args[:check] == answer
+          break
+        else
+          puts 'Exited!'
+          exit
+        end
+      end
 
-			answer
-		end
-	end
+      answer
+    end
+  end
 
-	WHITESPACE = /\s*/
-	EMPTY = ""
-	CURRENT_DIR = File.dirname(__FILE__)
-
-	################################
-
-	# SET UP ALL THE CONFIG OPTIONS
-	# Generator.new (the initialization function) is called in self.run
-
-	def initialize(args)
-		@type = args[:type]
-		@config = args[:config]['global']
-
-		all_components = @config['components']
-		component = all_components.find{ |t| t['name'] == @type }
-
-		# basically just rebuilding the object so we can use it here
-		@component = {
-			:of_type => component['type'],
-			:language => @config['language'][component['type']],
-			:using => component['using'],
-			:template => component['template']
-		}
-
-		template_dir = "#{CURRENT_DIR}/../templates/"
-		template_dir << "#{@component[:of_type]}/#{@component[:language]}/#{@component[:using]}/#{@component[:template]}"
-
-		@template_file = IO.read(template_dir)
-
-		if block_given?
-			yield(self)
-		end
-	end
-
-	###############################
-
-	def new_file_name
-		print "[?] New file name: "
-
-		@new_file = $stdin.gets.gsub(WHITESPACE,EMPTY)
-	end
-
-	def module_name
-		print "[?] Module name: "
-
-		@module_name = $stdin.gets.gsub(WHITESPACE,EMPTY)
-	end
-
-	def name
-		print "[?] #{@type.capitalize} name: "
-
-		@name = $stdin.gets.gsub(WHITESPACE,EMPTY)
-	end
-
-	def inject
-		# REVIEW: use symbols instead of strings?
-		special = ['routes','controller'].include?(@type)
-		auto_injections = [
-			{
-				:for_type => 'routes',
-				:service => '$routeProvider'
-			},
-			{
-				:for_type => 'controller',
-				:service => '$scope'
-			}
-		]
-
-		injection = special ? auto_injections.select { |inj| inj[:for_type] == @type }[0][:service] : nil
-
-		auto_injection_statement = special ? " (already injected #{injection})" : ''
-
-		print "[?] Inject#{auto_injection_statement}: "
-
-		# accepts a comma-delimited list
-		# EXAMPLE: testService, testService2
-		# => [testService,testService2]
-		@dependencies = $stdin.gets.split(',').map { |dep| dep.strip }.reject(&:empty?)
-
-		# automatically inject $scope into a controller
-		# FIXME: don't use index accessors (numbers are confusing)
-		@dependencies << auto_injections[1][:service] if @type == 'controller' && !@dependencies.include?(auto_injections[1][:service])
-
-		# automatically insert $routeProvider into a routes config
-		@dependencies << auto_injections[0][:service] if @type == 'routes' && !@dependencies.include?(auto_injections[0][:service])
-	end
-
-	def replace
-		# inject may or may not have run... if it wasn't run, then @dependencies was never set
-		# for example, for html templates, we don't run the inject function
-		# @dependencies = @dependencies || []
-		@dependencies ||= []
-		has_dependencies = @dependencies.size > 0
-
-		# Use 'config' as the type, since 'routes' is really an alias for a specific type of 'config'.
-		# TODO: map aliases from config file
-		@type = 'config' if @type == 'routes'
-
-		# Regex replacements to generate the template
-		@template_file = 	@template_file
-							.gsub(/\{\{type\}\}/,@type)
-							.gsub(/\{\{name\}\}/,@name || "")
-							.gsub(/\{\{module\}\}/, "#@module_name")
-							.gsub(
-								/\{\{inject\s\|\sarray_string\}\}/,
-								has_dependencies ?
-								@dependencies.to_s.gsub(/"/,'\'')
-								: '[]'
-							)
-							.gsub(
-								/\{\{inject\s\|\scomma_delimited_variables\}\}/,
-								has_dependencies ? 
-								@dependencies.each_with_index.inject("") { |str,(dep,i)| str+=dep.to_s+(i == @dependencies.size-1 ? "" : ", ") }
-								: ""
-							)
-	end
-
-	def tag
-		# If Liquid-style tags are used in a template that can be used
-		# for multiple components, remove those parts that don't
-		# belong to the type of component user wants to generate
-		@template_file =	@template_file
-							.gsub(/\{\%\sif\s#{@type}\s\%\}(.*)\{\%\sendif\s#{@type}\s\%\}/m, '\1')
-							.gsub(/\s\{\%\sif\s.*\s\%\}.*\{\%\sendif\s.*\s\%\}/m, '')
-	end
-
-	def write
-		# create the new file
-		def overwrite?
-			AskLoop.ask(:check => "y", :prompt => "File exists already, overwrite it? (y/n) ")
-		end
-
-		if(File.exist?(@new_file))
-			overwrite?
-		end
-
-		File.open(@new_file,'w') do |file|
-			file.write(@template_file)
-			file.close
-		end
-	end
-
-	# Use this function to be able to say AngularInit::Delegate::Generator.run() inside the executable file
-	# This function simply goes through all of the methods in order to interactively
-	# prompt the user to generate a new template
-	def self.run(args)
-		Generator.new(args) do |g|
-			g.new_file_name
-
-			# we don't need to define the module if we're creating a module
-			g.module_name unless args[:type] == 'module'
-
-			# 'run', 'config', and 'routes' don't have custom names in AngularJS
-			# REVIEW: use symbols instead of strings?
-			g.name unless ['run','config','routes','index'].include? args[:type]
-
-			g.inject unless ['index'].include? args[:type]
-
-			g.replace
-
-			g.tag
-
-			g.write
-		end
-
-		puts 'All done!'
-	end
-end
+  WHITESPACE = /\s*/
+  EMPTY = ''
+  CURRENT_DIR = File.dirname(__FILE__)
+
+  ################################
+
+  # SET UP ALL THE CONFIG OPTIONS
+  # Generator.new (the initialization function) is called in self.run
+
+  def initialize(args)
+    @type = args[:type]
+    @config = args[:config]['global']
+
+    all_components = @config['components']
+    component = all_components.find { |t| t['name'] == @type }
+
+    # basically just rebuilding the object so we can use it here
+    @component = {
+      of_type: component['type'],
+      language: @config['language'][component['type']],
+      using: component['using'],
+      template: component['template']
+    }
+
+    template_dir = "#{CURRENT_DIR}/../templates/"
+    template_dir << "#{@component[:of_type]}/#{@component[:language]}/#{@component[:using]}/#{@component[:template]}"
+
+    @template_file = IO.read(template_dir)
+
+    yield(self) if block_given?
+  end
+
+  ###############################
+
+  def new_file_name
+    print '[?] New file name: '
+
+    @new_file = $stdin.gets.gsub(WHITESPACE, EMPTY)
+  end
+
+  def module_name
+    print '[?] Module name: '
+
+    @module_name = $stdin.gets.gsub(WHITESPACE, EMPTY)
+  end
+
+  def name
+    print "[?] #{@type.capitalize} name: "
+
+    @name = $stdin.gets.gsub(WHITESPACE, EMPTY)
+  end
+
+  def inject
+    # REVIEW: use symbols instead of strings?
+    special = %w(routes controller).include?(@type)
+    auto_injections = [
+      {
+        for_type: 'routes',
+        service: '$routeProvider'
+      },
+      {
+        for_type: 'controller',
+        service: '$scope'
+      }
+    ]
+
+    injection = special ? auto_injections.select { |inj| inj[:for_type] == @type }[0][:service] : nil
+
+    auto_injection_statement = special ? " (already injected #{injection})" : ''
+
+    print "[?] Inject#{auto_injection_statement}: "
+
+    # accepts a comma-delimited list
+    # EXAMPLE: testService, testService2
+    # => [testService,testService2]
+    @dependencies = $stdin.gets.split(',').map(&:strip).reject(&:empty?)
+
+    # automatically inject $scope into a controller
+    # FIXME: don't use index accessors (numbers are confusing)
+    @dependencies << auto_injections[1][:service] if @type == 'controller' && !@dependencies.include?(auto_injections[1][:service])
+
+    # automatically insert $routeProvider into a routes config
+    @dependencies << auto_injections[0][:service] if @type == 'routes' && !@dependencies.include?(auto_injections[0][:service])
+  end
+
+  def replace
+    # inject may or may not have run... if it wasn't run, then @dependencies was never set
+    # for example, for html templates, we don't run the inject function
+    # @dependencies = @dependencies || []
+    @dependencies ||= []
+    has_dependencies = @dependencies.size > 0
+
+    # Use 'config' as the type, since 'routes' is really an alias for a specific type of 'config'.
+    # TODO: map aliases from config file
+    @type = 'config' if @type == 'routes'
+
+    # Regex replacements to generate the template
+    @template_file =  @template_file
+                      .gsub(/\{\{type\}\}/, @type)
+                      .gsub(/\{\{name\}\}/, @name || '')
+                      .gsub(/\{\{module\}\}/, "#{@module_name}")
+                      .gsub(
+                        /\{\{inject\s\|\sarray_string\}\}/,
+                        has_dependencies ?
+                        @dependencies.to_s.gsub(/"/, '\'') : '[]'
+                      )
+                      .gsub(
+                        /\{\{inject\s\|\scomma_delimited_variables\}\}/,
+                        has_dependencies ?
+                        @dependencies.each_with_index.inject('') { |str, (dep, i)| str += dep.to_s + (i == @dependencies.size - 1 ? '' : ', ') } : ''
+                      )
+  end
+
+  def tag
+    # If Liquid-style tags are used in a template that can be used
+    # for multiple components, remove those parts that don't
+    # belong to the type of component user wants to generate
+    @template_file =  @template_file
+                      .gsub(/\{\%\sif\s#{@type}\s\%\}(.*)\{\%\sendif\s#{@type}\s\%\}/m, '\1')
+                      .gsub(/\s\{\%\sif\s.*\s\%\}.*\{\%\sendif\s.*\s\%\}/m, '')
+  end
+
+  def write
+    # create the new file
+    def overwrite?
+      AskLoop.ask(check: 'y', prompt: 'File exists already, overwrite it? (y/n) ')
+    end
+
+    overwrite? if File.exist?(@new_file)
+
+    File.open(@new_file, 'w') do |file|
+      file.write(@template_file)
+      file.close
+    end
+  end
+
+  # Use this function to be able to say AngularInit::Delegate::Generator.run() inside the executable file
+  # This function simply goes through all of the methods in order to interactively
+  # prompt the user to generate a new template
+  def self.run(args)
+    Generator.new(args) do |g|
+      g.new_file_name
+
+      # we don't need to define the module if we're creating a module
+      g.module_name unless args[:type] == 'module'
+
+      # 'run', 'config', and 'routes' don't have custom names in AngularJS
+      # REVIEW: use symbols instead of strings?
+      g.name unless %w(run config routes index).include? args[:type]
+
+      g.inject unless ['index'].include? args[:type]
+
+      g.replace
+
+      g.tag
+
+      g.write
+    end
+
+    puts 'All done!'
+  end
+end

data/lib/ngi/utils/command_parser.rb

@@ -3,102 +3,99 @@
 # github.com/joshbeam/angular_init
 # MIT License
 
-
 # Similar to Ruby's OptionParser
 # However, this is customized for angular_init
-
 class CommandParser
-	attr_reader :args
-	attr_accessor :banner, :version, :separator, :name
-
-	def initialize
-		# TODO: to "Usage #{file_name}", etc.
-		@name = "<CLI>"
-		@banner = "Usage: #{@name} <command>"
-		@version = "0.0.0"
-		@separator = "===================="
-		@listeners = []
-
-		# automatically register some listeners
-		register_help
-		register_version
-
-		# be able to pass in a block for setup
-		if block_given?
-			yield(self)
-		end
-	end
-
-	def name=(name)
-		# need to also replace the name in the banner
-		@banner = @banner.gsub(@name,name)
-
-		@name = name
-	end
-
-	# register the listeners
-	def on(options,description="",&block)
-		listener = {}
-
-		# be able to pass in a single argument, or an array of arguments
-		options = *options unless options.is_a? Array
-
-		listener[:options] = options.map do |opt|
-			opt.strip.split(" ")
-		end
-
-		listener[:block] = block
-		listener[:description] = description
-
-		@listeners << listener
-	end
-
-	def parse(args)
-		# puts @listeners
-		matched_listener = {
-			:options => nil,
-			:block => nil
-		}
-
-		@listeners.each do |listener|
-			listener[:options].each do |opt_arr|
-				if opt_arr == args
-					matched_listener[:options] = opt_arr
-					matched_listener[:block] = listener[:block]
-					break
-				end
-			end
-		end
-
-		unless matched_listener[:options].nil?
-			# matched_listener[:options] should always be an array
-			# when we call, we can each member of that array to be
-			# passed separately
-			matched_listener[:block].call(*matched_listener[:options])
-		else
-			# if there was no match, show the help menu
-			parse(["-h"])
-		end
-	end
-
-	def register_help
-		# automaticaly register this listener
-		on(["-h","--help"],"Show the help menu") do
-			puts @separator
-			puts @banner
-
-			@listeners.each_with_index do |listener,i|
-				puts "\n"
-				puts "(#{i+1}) #{listener[:description]}: #{listener[:options].join(', ')}"
-			end
-			puts @separator
-		end
-	end
-
-	def register_version
-		# automaticaly register this listener
-		on(["-v","--version"],"Show the version") do
-			puts "#{@name} #{@version}"
-		end
-	end
-end
+  attr_reader :args
+  attr_accessor :banner, :version, :separator, :name
+
+  def initialize
+    # TODO: to "Usage #{file_name}", etc.
+    @name = '<CLI>'
+    @banner = "Usage: #{@name} <command>"
+    @version = '0.0.0'
+    @separator = '===================='
+    @listeners = []
+
+    # automatically register some listeners
+    register_help
+    register_version
+
+    # be able to pass in a block for setup
+    yield(self) if block_given?
+  end
+
+  def name=(name)
+    # need to also replace the name in the banner
+    @banner = @banner.gsub(@name, name)
+
+    @name = name
+  end
+
+  # register the listeners
+  def on(options, description = '', &block)
+    listener = {}
+
+    # be able to pass in a single argument, or an array of arguments
+    options = *options unless options.is_a? Array
+
+    listener[:options] = options.map do |opt|
+      opt.strip.split(' ')
+    end
+
+    listener[:block] = block
+    listener[:description] = description
+
+    @listeners << listener
+  end
+
+  def parse(args)
+    # puts @listeners
+    matched_listener = {
+      options: nil,
+      block: nil
+    }
+
+    @listeners.each do |listener|
+      listener[:options].each do |opt_arr|
+        if opt_arr == args
+          matched_listener[:options] = opt_arr
+          matched_listener[:block] = listener[:block]
+          break
+        end
+      end
+    end
+
+    if !matched_listener[:options].nil?
+      # matched_listener[:options] should always be an array
+      # when we call, we can each member of that array to be
+      # passed separately
+      matched_listener[:block].call(*matched_listener[:options])
+    else
+      # if there was no match, show the help menu
+      parse(['-h'])
+    end
+  end
+
+  def register_help
+    # automaticaly register this listener
+    on(['-h', '--help'], 'Show the help menu') do
+      puts @separator
+      puts @banner
+
+      @listeners.each_with_index do |listener, i|
+        desc = "\n" << "(#{i + 1}) #{listener[:description]}: "
+        desc << "#{listener[:options].join(', ')}"
+        puts desc
+      end
+      puts @separator
+    end
+  end
+
+  def register_version
+    # automaticaly register this listener
+    on(['-v', '--version'], 'Show the version') do
+      puts "#{@name} #{@version}"
+    end
+  end
+end

data/lib/ngi/utils/jser.rb

@@ -3,44 +3,44 @@
 # github.com/joshbeam/angular_init
 # MIT License
 
+# Since ngi is an AngularJS tool and the users
+# are familiar with JavaScript, this module of classes
+# prints a string version of a Ruby hash or array
+# as it would appear in normal JavaScript syntax
+# For example:
+# { "hello" => "world" }
+# becomes:
+# { 'hello': 'world' }
+# and ["some","array"]
+# becomes:
+# ['some','array']
 module JSer
-	# Since ngi is an AngularJS tool and the users
-	# are familiar with JavaScript, this class
-	# prints a string version of a Ruby hash or array
-	# as it would appear in normal JavaScript syntax
-	# For example:
-	# { "hello" => "world" }
-	# becomes:
-	# { 'hello': 'world' }
-	# and ["some","array"]
-	# becomes:
-	# ['some','array']
-	def to_str
-		self.to_s.gsub(/\"/,"'").gsub(/\=\>/,": ")
-	end
+  def to_str
+    to_s.gsub(/\"/, "'").gsub(/\=\>/, ': ')
+  end
 
-	# A JSer class
-	# Usage:
-	#     JSHash.new({"hello" => "world"}).to_str
-	class JSHash < Hash
-		def initialize(hash)
-			super
-			hash.each do |key,val|
-				self[key] = val
-			end
-		end
+  # A JSer class
+  # Usage:
+  #     JSHash.new({"hello" => "world"}).to_str
+  class JSHash < Hash
+    def initialize(hash)
+      super
+      hash.each do |key, val|
+        self[key] = val
+      end
+    end
 
-		include JSer
-	end
+    include JSer
+  end
 
-	# Another JSer class
-	# Usage:
-	#     JSArray.new(["some","array"]).to_str
-	class JSArray < Array
-		def initialize(array)
-			super
-		end
+  # Another JSer class
+  # Usage:
+  #     JSArray.new(["some","array"]).to_str
+  class JSArray < Array
+    def initialize(array)
+      super
+    end
 
-		include JSer
-	end
-end
+    include JSer
+  end
+end

data/lib/ngi/utils/utils.rb

@@ -3,28 +3,30 @@
 # github.com/joshbeam/angular_init
 # MIT License
 
-require_relative "command_parser"
-require_relative "jser"
+require_relative 'command_parser'
+require_relative 'jser'
 
+# This module holds classes of basic utility
+# functions used throughout Ngi
 module Utils
-	CommandParser = ::CommandParser
-	JSArray = JSer::JSArray
-	JSHash = JSer::JSHash
+  CommandParser = ::CommandParser
+  JSArray = JSer::JSArray
+  JSHash = JSer::JSHash
 
-	class AskLoop; end
+  class AskLoop; end
 
-	# This class is just a way to meaningfully
-	# collect an array of valid user inputs
-	# for use with OptionParser in bin/ngi
-	class UserInput
-		attr_reader :valid_inputs
-		
-		def initialize(args)
-			@valid_inputs = args[:valid_inputs]
-		end
+  # This class is just a way to meaningfully
+  # collect an array of valid user inputs
+  # for use with OptionParser in bin/ngi
+  class UserInput
+    attr_reader :valid_inputs
 
-		def valid?(input)
-			@valid_inputs.include?(input)
-		end
-	end
-end
+    def initialize(args)
+      @valid_inputs = args[:valid_inputs]
+    end
+
+    def valid?(input)
+      @valid_inputs.include?(input)
+    end
+  end
+end

data/lib/ngi/version.rb

@@ -1,3 +1,11 @@
+# angular_init (short-name: ngi)
+# Copyright 2015 Joshua Beam
+# github.com/joshbeam/angular_init
+# MIT License
+
+# The current version of Ngi.
+# This uses semantic versioning.
+# See http://semver.org/
 module Ngi
-  VERSION = "0.2.1"
-end
+  VERSION = '0.2.2'
+end

data/ngi.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{This tool can make (for example) an AngularJS controller template file for you (.js), so that whenever you want to make a new controller for your app, you don't have to type the same starting code over and over again (by the way, this tool doesn't only create controllers. It does directives, filters... almost anything). ngi has one task, and one task only, which makes it lightweight and specialized. Most AngularJS developers are probably using the command line already (Gulp, Bower, npm, Git, etc.), so why not use the command line to streamline your code-writing too? Type less, write more AngularJS!}
   spec.homepage      = "https://github.com/joshbeam/angular_init"
   spec.license       = "MIT"
+  spec.required_ruby_version = ">= 2.1"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = ["ngi"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ngi
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Joshua Beam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - lib/templates/script/es5/default/constant.js
 - lib/templates/script/es5/default/module.js
 - ngi.gemspec
+- ngi_example.gif
 homepage: https://github.com/joshbeam/angular_init
 licenses:
 - MIT
@@ -113,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="