Fix issues related to recent PyroCMS API updates

Author: websemantics

.gitignore

@@ -1,2 +1,3 @@
 /vendor
+.DS_Store
 composer.lock

CHANGELOG.md

@@ -1,3 +1,7 @@
+#### [1.1.6] - 2017-90-11
+##### Changed
+  -  Fix issues related to recent PyroCMS API updates
+
 #### [1.1.5] - 2017-90-10
 ##### Changed
   -  Upgrade to Twig v4

README.md

@@ -72,7 +72,7 @@ Use the `make:addon` command as per usual, [documentation](https://www.pyrocms.c
 php artisan make:addon vendor.module.name
 ```
 
-The previous command creates a module based on the [default module](https://github.com/pyrocms-templates/default-module) template. The downloaded module template will be cached  at `app/storage/streams/default/builder/default-module`.
+The previous command creates a module based on the [default module](https://github.com/pyrocms-templates/default-module) template. The downloaded module template will be cached  at `storage/streams/default/builder/default-module`.
 
 **NOTE**: A fields migration file will not be generated as per Pyro 3 default `make:addon` command behaviour. The builder extension generates a separate fields migration file for each [stream migration](#make-stream) instead.
 

resources/config/config.php

@@ -58,7 +58,7 @@
       |
       | Where templates are stored in the storage folder
       |
-      | i.e. 'app/storage/streams/default/builder'
+      | i.e. 'storage/streams/default/builder'
       |
       |
       */

src/Console/Make.php

@@ -52,7 +52,7 @@ class Make extends \Anomaly\Streams\Platform\Stream\Console\Make
     /**
      * Execute the console command.
      */
-    public function fire(AddonCollection $addons)
+    public function handle(AddonCollection $addons)
     {
         $schema = $this->argument('schema');
         $stream_slug = explode(':', trim($schema))[0];

src/Console/MakeAddon.php

@@ -83,7 +83,7 @@ public function handle(AddonManager $addons, AddonLoader $loader, Repository $co
         $this->ignoreJobs = false;
       }
 
-      parent::fire($addons);
+      parent::handle($addons, $loader, $config);
     }
 
     /**

src/Traits/Registry.php

@@ -168,19 +168,19 @@ protected function download($template, $force = false)
                             'registry' => $this->registry,
                             'template' => $template, ]);
 
-        /* get a temp folder to download the template zip to */
-        $tmp = $this->getBuilderPath(_config('config.tmp'));
+            /* get a temp folder to download the template zip to */
+            $tmp = $this->getBuilderPath(_config('config.tmp'));
 
             try {
                 /* download the template zip file, show progress, uncompress and remove */
-          $bar->start(" Downloading '$template' ... ");
+                $bar->start(" Downloading '$template' ... \n");
 
                 $this->files->put($tmp, file_get_contents($src, false, stream_context_create([],
-          ['notification' => function ($notification_code) use ($bar) {
-              if (in_array($notification_code, [STREAM_NOTIFY_CONNECT, STREAM_NOTIFY_PROGRESS])) {
-                  $bar->advance();
-              }
-          }])));
+                ['notification' => function ($notification_code) use ($bar) {
+                    if (in_array($notification_code, [STREAM_NOTIFY_CONNECT, STREAM_NOTIFY_PROGRESS])) {
+                        $bar->advance();
+                    }
+                }])));
                 $this->zip->open($tmp);
                 $this->zip->extractTo($dist);
                 $this->zip->close();