ptero 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d4792a46c456252b457597f5c0a6ff05d3937d1
-  data.tar.gz: 922fcf8074aa76113104c1d07d4140bcef12a43c
+  metadata.gz: a27fb5289bea6827e5b3b7cb7145a06d482cb17f
+  data.tar.gz: 8fd22cae5ea40774e96784ad43c428a8f68a6e39
 SHA512:
-  metadata.gz: 50fabbb8af36688eab64319d0ce8bbdb4b1d3188e14be69539b33ddbc1a56eafb917a5f3f00e8560a6aab70735cd5566f32515db07c0ca36fb2fb47a15f53a71
-  data.tar.gz: b453ce63d1b3e6b2a456cbc23b7fbff9b1d8a7ed5eb99045d4dd28099022b427d9a99c705df9e74b3748e4a3a8d25289e3d0bff61770f32d9400445717cdc871
+  metadata.gz: 919135e5a2ca537f012aa988275e43024901ef35a004d1adca05f168cd4b733442e5bbd8f86ec4b4ca4349dc85e977a0eeb747296f6b12c6997bbd0ba1a1ad49
+  data.tar.gz: 6f63fa5383ce9263dee0365f292975e3fb4b64475a6baf1995cbb2255ccfc7a384f5a21245bb5cb5765e0014b000dd0446eeff04e6535ad178a0693ed598a406

data/lib/ptero.rb

@@ -8,7 +8,4 @@ require 'pathname'
 # The namespace for all Ptero classes and constants
 module Ptero
   
-  # The directory location of all Ptero templates for code generation
-  TEMPLATE_PATH = Pathname.new("#{__dir__}/ptero/templates")
-  
 end

data/lib/ptero/application.rb

@@ -18,14 +18,36 @@ module Ptero
     # Input a directory String or Pathname to make a new Application from that path. (Defaults to Dir.pwd)
     # @param dir [Pathname,String] the Application directory
     def initialize(dir=Dir.pwd)
-      @name = dir.to_s.split('/').last.capitalize
       @dir = Pathname.new(dir)
       
+      @name = ''
+      
+      composer_path = @dir.join('composer.json')
+      if File.exist? composer_path
+        
+        hash = JSON.parse File.read(composer_path)
+        
+        if hash['dinosaur'] && hash['dinosaur']['root'].eql?(true) && hash['dinosaur']['name']
+          @name = hash['dinosaur']['name']
+        end
+        
+        
+      end
       
     end
     
     attr_reader :name,:dir
     
+    # Find out if this folder really contains a Ptero application using metadat
+    # @return [Boolean] whether or not this application was verified successfully
+    def verify
+      composer_path = dir.join('composer.json')
+      return false unless File.exist? composer_path
+      hash = JSON.parse File.read(composer_path)
+      return false unless hash['dinosaur'] && hash['dinosaur']['root']
+      true
+    end
+    
     # Find out whether or not the user has the PHP command-line tool installed so that they can use Composer.
     # @return [Boolean] whether or not the user's PHP command works.
     def test_php
@@ -39,7 +61,7 @@ module Ptero
     # 
     # @return [Application,Boolean] self
     def get_composer
-      raise Ptero::Exception::ApplicationException, "Application #{self} already has composer.phar file" if has_composer?
+      raise Ptero::Exception::ApplicationException, "Application \"#{self.name}\" already has composer.phar file" if has_composer?
       Dir.chdir @dir do
         # Download code from the composer website
         # https://getcomposer.org
@@ -56,7 +78,7 @@ module Ptero
           puts
           
           unless exit_status.success?
-            raise Ptero::Exception::ApplicationException, "Could not install Composer in Application #{self.dir} with command `#{command}`. Output was: \"#{output.chomp}\"" 
+            raise Ptero::Exception::ApplicationException, "Could not install Composer in Application \"#{self.name}\" with command `#{command}`. Output was: \"#{output.chomp}\"" 
           end
           
           puts 'Done!'
@@ -68,7 +90,7 @@ module Ptero
     # Remove the composer.phar file
     # @return [Application,Boolean] self if composer was removed, flse if composer is not downloaded
     def remove_composer
-      raise Ptero::Exception::ApplicationException, "Application #{self} does not have a composer.phar file" unless has_composer?
+      raise Ptero::Exception::ApplicationException, "Application \"#{self.name}\" does not have a composer.phar file" unless has_composer?
       File.unlink(dir.join('composer.phar'))
       self
     end
@@ -87,7 +109,7 @@ module Ptero
     def install_dependencies
       raise Ptero::Exception::ApplicationException, "Not a dinosaur root: #{Dir.pwd}" unless verify
       raise Ptero::Exception::ApplicationException, "PHP command-line tool failed, update your version of PHP" unless test_php
-      # get_composer unless has_composer?
+      get_composer unless has_composer?
       Dir.chdir @dir do
         # Install dependencies using Composer
         # https://getcomposer.org
@@ -105,7 +127,7 @@ module Ptero
           puts
           
           unless exit_status.success?
-            raise Ptero::Exception::ApplicationException, "Could not install dependencies in Application #{self.dir} with command `#{command}`. Output was: \"#{output.chomp}\""
+            raise Ptero::Exception::ApplicationException, "Could not install dependencies in Application \"#{self.name}\" with command `#{command}`. Output was: \"#{output.chomp}\""
           end
           puts 'Done!'
         end
@@ -135,7 +157,7 @@ module Ptero
           puts
           
           unless exit_status.success?
-            raise Ptero::Exception::ApplicationException, "Could not update dependencies in Application #{self.dir} with command `#{command}`. Output was: \"#{output.chomp}\""
+            raise Ptero::Exception::ApplicationException, "Could not update dependencies in Application \"#{self.name}\" with command `#{command}`. Output was: \"#{output.chomp}\""
           end
           
           puts 'Done!'
@@ -152,16 +174,6 @@ module Ptero
       @dir.join('vendor').directory?
     end
     
-    # Find out if this folder really contains a Ptero application using metadata in composer.json
-    # @return [Boolean] whether or not this application was verified successfully.
-    def verify
-      composer_path = dir.join('composer.json')
-      return false unless File.exist? composer_path
-      hash = JSON.parse File.read(composer_path)
-      return false unless hash['dinosaur'] && hash['dinosaur']['root']
-      self
-    end
-    
     # Generate a file using the given arguments
     # @param klass [String,Class] what type of file to generate
     # @param *params all other parameters to pass to the generator
@@ -262,12 +274,14 @@ module Ptero
       # @return [Application] the new Application object
       def create(name,dir=Pathname.new(Dir.pwd))
         
+        name = "#{name[0].upcase}#{name[1,name.length-1]}"
+        
         Dir.chdir dir do
-          raise Ptero::Exception::ApplicationException, "Cannot create project #{name} because a file already exists with that name" if File.exist? name 
+          raise Ptero::Exception::ApplicationException, "Cannot create project \"#{name}\" because a file already exists with that name" if File.exist? name.downcase 
         
-          puts "Creating directory #{name} in #{Dir.pwd}"
-          Dir.mkdir(name)
-          Dir.chdir(name) do
+          puts "Creating directory #{name.downcase} in #{Dir.pwd}"
+          Dir.mkdir(name.downcase)
+          Dir.chdir(name.downcase) do
             
             puts "Loading default composer.json"
             composer = JSON.parse( File.read("#{__dir__}/composer_default.json") )
@@ -298,14 +312,16 @@ module Ptero
       # @return [Application] the verified Application object
       def app_for(dir=Dir.pwd)
         path = Pathname.new dir
-        path.realpath.ascend do |level|
-          app = self.new(level)
+        path.ascend do |level|
+          app = new(level)
           return app if app.verify
         end
         
         raise Ptero::Exception::ApplicationException, "Couldn't find composer.json with dinosaur information in #{dir} or parent directories"
       end
       
+
+      
       # Return the verified Application object corresponding to Dir.pwd or its parent directories
       # @return [Application] the Application object that represents the found verified application
       def current_app

data/lib/ptero/cli.rb

@@ -25,7 +25,9 @@ module Ptero
       def const_missing(const_name)
         # Load the cli
         require "#{__dir__}/cli/#{const_name.downcase}.rb"
-        return const_get const_name
+        return const_get const_name if const_defined? const_name
+        super
+      # If we couldn't load it, throw an error
       rescue LoadError
         super
       end

data/lib/ptero/cli/root.rb

@@ -47,7 +47,7 @@ class Ptero::CLI::Root < Ptero::CLI
       # PHP
       Dir.mkdir 'php'
       app.generate('PHP_Info')
-      app.generate_setup(app.name.downcase)
+      app.generate_setup
       app.generate_routes
       
       Dir.mkdir 'php/controllers'
@@ -151,7 +151,7 @@ class Ptero::CLI::Root < Ptero::CLI
   # and exits.
   # @param dir [String,Pathname] the directory to destroy
   def destroy(dir = Dir.pwd)
-    a = Ptero::Application.new(dir)
+    a = Ptero::Application.app_for(dir)
     if a.verify
       puts "Are you sure you want to destroy #{dir}? Type 'Yes' to authorize".yellow
       print '>> '
@@ -176,18 +176,6 @@ class Ptero::CLI::Root < Ptero::CLI
     end
   end
   
-  desc 'update', 'Update dependencies'
-  long_desc <<-LONGDESC
-    Use the composer.json file to update dependencies. Install Composer if it is not already downloaded.
-  LONGDESC
-  # Call the appropriate Application methods to update Composer dependencies.
-  # If verify returns false, install quits with the ptero_dir_message text
-  def update
-    verify do
-      app.update_dependencies
-    end
-  end
-  
   desc 'composer', 'Download composer.phar'
   long_desc <<-LONGDESC
     Download the compser.phar file in order to facilitate future downloads

data/lib/ptero/exception.rb

@@ -14,7 +14,8 @@ class Ptero::Exception < StandardError
     def const_missing(const_name)
       # Require the exception
       require "#{__dir__}/exceptions/#{const_name.downcase}.rb"
-      return const_get const_name
+      return const_get const_name if const_defined? const_name
+      super
     # If we couldn't load the file, throw an error
     rescue LoadError
       super

data/lib/ptero/generator.rb

@@ -65,7 +65,7 @@ module Ptero
     # The path to the directory where Ptero templates are stored
     # @return [String] the aforementioned path
     def template_path
-      Pathname.new("#{Ptero::TEMPLATE_PATH}/#{self.class.name.split('::').last.downcase}.#{extension}.erb")
+      Pathname.new("#{TEMPLATE_PATH}/#{self.class.name.split('::').last.downcase}.#{extension}.erb")
     end
     
     # Generate a file and print the location of the generated file
@@ -127,6 +127,10 @@ module Ptero
       self
     end
     
+  
+    # The directory location of all Ptero templates for code generation
+    TEMPLATE_PATH = Pathname.new("#{__dir__}/templates")
+    
     
   
     class << self
@@ -134,7 +138,8 @@ module Ptero
       def const_missing(const_name)
         # Require the generator
         require "#{__dir__}/generators/#{const_name.downcase}.rb"
-        return const_get const_name
+        return const_get const_name if const_defined? const_name
+        super
       # If we couldn't load the file, throw an error
       rescue LoadError
         super

data/lib/ptero/generators/javascriptgenerator.rb

@@ -13,7 +13,7 @@ class Ptero::Generator::JavascriptGenerator < Ptero::Generator
   # @param name [String] the name of the Javascript
   # @param desc [String] a String to describe this script
   def initialize(name,desc = 'This script does...')
-    super name
+    super name.downcase
     @desc = desc
   end
   

data/lib/ptero/generators/layoutgenerator.rb

@@ -11,7 +11,7 @@
 
 # Generate application layout template
 class Ptero::Generator::LayoutGenerator < Ptero::Generator::TwigGenerator
-  # @param name [String] the name of the application
+  # @param name [String] the name of the layout
   def initialize(name='application')
     super(name)
   end

data/lib/ptero/generators/setupgenerator.rb

@@ -10,4 +10,9 @@
 # A generator for "setup" files that load dependencies and initialize the application
 class Ptero::Generator::SetupGenerator < Ptero::Generator::PHPGenerator
   
+  # The name of the setup is always the same as the name of the Application
+  def initialize
+    super Ptero::Application.app_for(Dir.pwd).name.downcase
+  end
+  
 end

data/lib/ptero/generators/stylesheetgenerator.rb

@@ -13,7 +13,7 @@ class Ptero::Generator::StylesheetGenerator < Ptero::Generator
   # @param name [String] the name of the stylesheet
   # @param desc [String] a String to describe this stylesheet
   def initialize(name,desc = 'The purpose of this stylesheet is...')
-    super name
+    super name.downcase
     @desc = desc
   end
   

data/lib/ptero/generators/twiggenerator.rb

@@ -10,6 +10,10 @@
 # Generator for Twig templates
 class Ptero::Generator::TwigGenerator < Ptero::Generator
   
+  def initialize(name)
+    super name.downcase
+  end
+  
   # @return [String] "html.twig"
   def extension
     'html.twig'

data/lib/ptero/generators/viewgenerator.rb

@@ -12,13 +12,13 @@
 # Generator for a view that extends a layout
 class Ptero::Generator::ViewGenerator < Ptero::Generator::TwigGenerator
 
-# @param name [String] the name of the view
-# @param parent [String] the name of the layout to extend
+  # @param name [String] the name of the view
+  # @param parent [String] the name of the layout to extend
   def initialize(name,parent='application')
     super(name)
     @parent = parent
   end
 
-attr_reader :parent
+  attr_reader :parent
 
 end

data/lib/ptero/templates/controllergenerator.php.erb

@@ -8,7 +8,7 @@
  *
  */
 
-namespace <%= app.name.capitalize %>\Controllers;
+namespace <%= app.name %>\Controllers;
 
 
 class <%= name %> extends <%= parent %> {

data/lib/ptero/templates/landinggenerator.php.erb

@@ -1,3 +1,3 @@
 <?php
-require_once __DIR__ . '/../php/<%= app.name %>.php';
+require_once __DIR__ . '/../php/<%= app.name.downcase %>.php';
 ?>

data/lib/ptero/templates/modelgenerator.php.erb

@@ -12,7 +12,7 @@
  */
 
 
-namespace <%= app.name.capitalize %>\Models;
+namespace <%= app.name %>\Models;
 
 class <%= name %> extends \ActiveRecord\Model {
 

data/lib/ptero/templates/phpclassgenerator.php.erb

@@ -11,10 +11,10 @@
 
 
 
-namespace <%= app.name.capitalize %>;
+namespace <%= app.name %>;
 
 
-class <%= name %> <%= !parent.nil? && "extends #{parent}" %> {
+class <%= name %> <%= parent.nil? ? '' : "extends #{parent} " %>{
 	
 	
 	

data/lib/ptero/templates/routesgenerator.php.erb

@@ -4,7 +4,7 @@
 $application->route(array(
 	
 	<% routes.each_pair do |key,value| %>
-	  '<%= key %>' => '<%= app.name.capitalize %>\Controllers\<%= value %>Controller',
+	  '<%= key %>' => '<%= app.name %>\Controllers\<%= value %>Controller',
 	<% end %>
 ));
 

data/lib/ptero/version.rb

@@ -1,4 +1,4 @@
 module Ptero
   # Do you I need to explain this?
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/test/fixtures/test_generators_fixtures.yaml

@@ -65,10 +65,9 @@ generators:
     - global_template
   phpinfogenerator:
     params:
+  setupgenerator:
+    params:
   routesgenerator:
     params:
     - routes:
-      asdf: Asdf
-  setupgenerator:
-    params:
-    - nm
+      asdf: Asdf

data/test/test_application.rb

@@ -71,14 +71,24 @@ class TestApplication < MiniTest::Test
   
   def test_verify_application
     assert @app.verify
-    a = Ptero::Application.new(__dir__)
-    refute a.verify
+    Mute::IO.capture_stdout do
+      a = Ptero::Application.create('throwaway')
+      assert a.verify
+      a.destroy
+      refute a.verify
+    end
+    
+    Mute::IO.capture_stdout do
+      assert_raises Ptero::Exception::ApplicationException do
+        app = Ptero::Application.app_for('throwaway')
+      end
+    end
   end
   
   def test_application_generate
     Mute::IO.capture_stdout do
-      ['controller','setup','javascript'].each do |str|
-        g = Ptero::Generator.const_get("#{str.capitalize}Generator".intern).new('review')
+      ['controller','model','javascript'].each do |str|
+        g = Ptero::Generator.const_get("#{str[0].upcase}#{str[1,str.length-1]}Generator".intern).new('review')
         @app.generate(str,'review')
         assert g.generated?
         
@@ -92,9 +102,9 @@ class TestApplication < MiniTest::Test
   end
   
   def test_generated
-    ['controller','setup','javascript'].each do |str|
+    ['controller','model','javascript'].each do |str|
       name = 'exams'
-      gen = Ptero::Generator.const_get("#{str.capitalize}Generator".intern).new(name)
+      gen = Ptero::Generator.const_get("#{str[0].upcase}#{str[1,str.length-1]}Generator".intern).new(name)
       Mute::IO.capture_stdout do
         refute gen.generated?
         refute @app.generated? gen.class, name

data/test/test_exceptions.rb

@@ -8,7 +8,7 @@ require 'ptero'
 
 class TestExceptions < MiniTest::Test
   
-  def exceptions_should_be_exceptions
+  def test_exceptions_should_be_exceptions
     @exceptions.each do |klass|
       exception = klass.new('Something bad happened!')
       
@@ -20,7 +20,7 @@ class TestExceptions < MiniTest::Test
     end
   end
   
-  def exceptions_should_raise
+  def test_exceptions_should_raise
     @exceptions.each do |klass|
       exception = klass.new('Something bad happened!')
       
@@ -39,7 +39,7 @@ class TestExceptions < MiniTest::Test
       require location
     end
    
-    @exceptions = Ptero::Exception.constants.map { |sym| Ptero::Generator.const_get(sym) }
+    @exceptions = Ptero::Exception.constants.map { |sym| Ptero::Exception.const_get(sym) }
   end
   
   

data/test/test_generators.rb

@@ -59,8 +59,10 @@ class TestGenerators < MiniTest::Test
   def test_generators_should_complain
     @generators.each do |gen|
       type = gen.to_s.split('::').last.downcase
+      
       params = @fixture['generators'][type]['params']
       g = gen.new(*params)
+      
       assert_raises(Ptero::Exception::GeneratorException) do
         g.remove
       end
@@ -80,7 +82,7 @@ class TestGenerators < MiniTest::Test
    app
    generators
    fixture
- end
+  end
  
  def app
    Dir.chdir __dir__
@@ -95,7 +97,7 @@ class TestGenerators < MiniTest::Test
      require location
    end
    
-   @generators = Ptero::Generator.constants.map { |sym| Ptero::Generator.const_get(sym) }
+   @generators = Ptero::Generator.constants.select { |sym| sym.match /(\w+)Generator/ }.map { |sym| Ptero::Generator.const_get(sym) }
  end
  
  def fixture

data/test/test_root.rb

@@ -15,12 +15,8 @@ class TestRoot < MiniTest::Test
   def setup
     @klass = Ptero::CLI::Root
     Dir.chdir __dir__
-    if FileTest.directory? 'root'
-      @app = Ptero::Application.new('root')
-    else
-      Mute::IO.capture_stdout do
-        @app = Ptero::Application.create('root')
-      end
+    Mute::IO.capture_stdout do
+      @app = Ptero::Application.create('example')
     end
     Dir.chdir @app.dir
   end
@@ -51,7 +47,7 @@ class TestRoot < MiniTest::Test
     end
     
     
-    Mute::IO.capture_stdout do  
+    Mute::IO.capture_stdout do
       @app.generate('routes')
       @klass.start(['route', '/app/path/:number.jpg', 'Photo'])
     end
@@ -69,9 +65,7 @@ class TestRoot < MiniTest::Test
   def test_verify
     Mute::IO.capture_stdout do
       Dir.mkdir('notapp')
-      notapp = Ptero::Application.new('notapp')
       refute @klass.start(['verify','notapp'])
-      refute notapp.verify
       Dir.chdir 'notapp' do
         refute @klass.start(['verify'])
       end
@@ -127,7 +121,7 @@ class TestRoot < MiniTest::Test
     end
     assert @app.has_composer?
   end
-  
+
   def test_install
     Mute::IO.capture_stdout do
       @app.get_composer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ptero
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - LuminousRubyist