ptero 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 165c7c7850463518a58561f975ff4c863b628811
-  data.tar.gz: f279bc9d3e83b175e0a375efd23f8d97db7538d0
+  metadata.gz: 3d4792a46c456252b457597f5c0a6ff05d3937d1
+  data.tar.gz: 922fcf8074aa76113104c1d07d4140bcef12a43c
 SHA512:
-  metadata.gz: fa735b7f0551635eed1627275afcb2b36b58dffc0236912baa06b257079b24627a1dca74d20cee75df16b24543069395600b6a9b059da3c57e3116907047e952
-  data.tar.gz: f3df3bfd2cb0ef71fb9c9885a00bb8f0580015a03663b1f0a39a1c89642841bfd7b99cf3c8bac371923c44cabe2496dec4b0a6ed114ef38ed0ee5b3a2d712bd2
+  metadata.gz: 50fabbb8af36688eab64319d0ce8bbdb4b1d3188e14be69539b33ddbc1a56eafb917a5f3f00e8560a6aab70735cd5566f32515db07c0ca36fb2fb47a15f53a71
+  data.tar.gz: b453ce63d1b3e6b2a456cbc23b7fbff9b1d8a7ed5eb99045d4dd28099022b427d9a99c705df9e74b3748e4a3a8d25289e3d0bff61770f32d9400445717cdc871

data/README.md

@@ -1,4 +1,6 @@
-### Ptero
+Ptero [![Gem Version](https://badge.fury.io/rb/ptero.svg)](http://badge.fury.io/rb/ptero)
+=====
+
 Ptero is a fast and flexible model-view-controller framework for PHP. It allows you to generate models, views, controllers, and routes instantly over the command-line and automatically provides a strong, clean structure for running web apps.
 
 Think wearing a giant robot exo-skeleton with lasers and missile launchers while crushing the puny challenges of archaic PHP in a two-hour-long feature film directed by Michael Bay. It's that good.
@@ -15,11 +17,11 @@ Features include:
 
 ### It takes care of the bad stuff
 Don't worry about:
- * annoying PHP syntax errors
+ * PHP syntax errors
  * copy-pasting or otherwise repeating code
  * SQL, SQL injection, escaping strings, etc
- * URLs that look ugly
- * PHP being stupid in general
+ * Confusing URLs and query strings
+ * Frustrating design or structural problems
 
 ### How do I do it?
 To start using Ptero, make sure your PHP command-line tool is up-to-date, then run the following:

data/lib/ptero/application.rb

@@ -43,12 +43,22 @@ module Ptero
       Dir.chdir @dir do
         # Download code from the composer website
         # https://getcomposer.org
-        Open3.popen3("php -r \"readfile('https://getcomposer.org/installer');\" | php") do |stdin,stdout,stderr|
+        command = "php -r \"readfile('https://getcomposer.org/installer');\" | php"
+        Open3.popen2(command,{:err => [:child, :out]}) do |stdin,stdout,wait_thr|
           print 'Downloading composer'
+          output = ''
           stdout.each_line do |line|
+            output << line
             print '.'
           end
+          exit_status = wait_thr.value
+          
           puts
+          
+          unless exit_status.success?
+            raise Ptero::Exception::ApplicationException, "Could not install Composer in Application #{self.dir} with command `#{command}`. Output was: \"#{output.chomp}\"" 
+          end
+          
           puts 'Done!'
         end
       end
@@ -77,15 +87,26 @@ 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?
       Dir.chdir @dir do
         # Install dependencies using Composer
         # https://getcomposer.org
-        Open3.popen3('php composer.phar install') do |stdin,stdout,stderr|
+        command = 'php composer.phar install'
+        Open3.popen2(command,{:err => [:child, :out]}) do |stdin,stdout,wait_thr|
           print 'Installing dependencies'
+          output = ''
           stdout.each_line do |line|
+            output << line
             print '.'
           end
+          
+          exit_status = wait_thr.value
+          
           puts
+          
+          unless exit_status.success?
+            raise Ptero::Exception::ApplicationException, "Could not install dependencies in Application #{self.dir} with command `#{command}`. Output was: \"#{output.chomp}\""
+          end
           puts 'Done!'
         end
       end
@@ -98,11 +119,26 @@ module Ptero
     def update_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?
       Dir.chdir @dir do
         # Update dependencies using Composer
         # https://getcomposer.org
-        Open3.popen3('php composer.phar update') do |stdin,stdout,stderr|
-          stdout.read
+        command = 'php composer.phar update'
+        Open3.popen2(command,{:err => [:child, :out]}) do |stdin,stdout,wait_thr|
+          print 'Updating dependencies'
+          output = ''
+          stdout.each_line do |line|
+            output << line
+            print '.'
+          end
+          exit_status = wait_thr.value  
+          puts
+          
+          unless exit_status.success?
+            raise Ptero::Exception::ApplicationException, "Could not update dependencies in Application #{self.dir} with command `#{command}`. Output was: \"#{output.chomp}\""
+          end
+          
+          puts 'Done!'
         end
       end
       self

data/lib/ptero/cli/root.rb

@@ -30,7 +30,7 @@ class Ptero::CLI::Root < Ptero::CLI
       composer()
       install()
     end
-    puts "Change your working directory to '#{Dir.pwd}/#{name}' and starting generating files with 'ptero generate' to start your application"
+    puts "Change your working directory to '#{Dir.pwd}/#{name}' and start generating files with 'ptero generate' to start your application"
   end
   
   desc 'seed NAME', 'Seed a new application'
@@ -166,7 +166,7 @@ class Ptero::CLI::Root < Ptero::CLI
   
   desc 'install', 'Install dependencies'
   long_desc <<-LONGDESC
-    Use the composer.json file to install dependencies
+    Use the composer.json file to install dependencies. Install Composer if it is not already downloaded.
   LONGDESC
   # Call the appropriate Application methods on the current Application to install Composer dependencies.
   # If verify returns false, install quits with the ptero_dir_message text
@@ -176,6 +176,18 @@ 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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ptero
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - LuminousRubyist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler