shop 0.1.8 → 0.1.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTUxZjYwODM5NjMwNGY2OGJhMzZiNTFlMTI1YzRmYjQ1ZTc5N2QwZQ==
+    NDUzOTc4MzA4NGE0Zjc5NTJkNTM4Mjk1Y2I4YjZlZDdhNjU3NzIxZg==
   data.tar.gz: !binary |-
-    YmRjNjJmNzU0YWI5NzA3ODk2MTlkMWQ2NzI0NWYwNTRkYmExYWJhYg==
+    NjE5ZjE0MmNkZWZjNTE0N2ExODQ1OWQyMDBkZGNiNzIyYzMzNTJkYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWE3ZTIxYjIxNzZmZmFlZjg2Y2E4NzgyMmQxOTdhZmEwNTFmNzYzYTc4ZjFk
-    NmQ3MThkOGE4MTNlZjg0ZDU2NmJhNDE0YTQ0YTNkODQwMzVmNDkwYWEzOWM0
-    MmYxNzk2NTg2NDUzOWY3M2U0ZDBmOThkZDZjZDQxZDkyN2RhNGE=
+    NTFlZjc0Y2EzZjhkMGQ2MDAwYmIxM2MzNDQ0MDlkNWQzNDBiM2YzOGVkZjcx
+    ZGY2ZGZiZjY0YjNiOGJkZjFjYjNkMzE4Mjg3YjQyNzllNzBhYTliZmI3YmE2
+    ODk5MzI3ODliNWU3YWE5NjdiZTI3M2JlYTBiNmJkNTFhN2ExYmQ=
   data.tar.gz: !binary |-
-    ZDFhMzVhMjEzMTRjMDVmZWVmNWRlNzlmOWNkOGNhZTNiMDc1ZmI0OTNhY2U4
-    NDUwZGZlNTVlMDc1ZGE3MTgyZTc3NjgzYjY3MjBjYWU0ZDJhYjVmMThlMjEx
-    YWQ2MmZjM2YxMjkxY2Y0MjkzODM3NDFmNDI5MGMyZmVlMmE4ZWM=
+    ZTMyYzY4MTQyNGZjMmMzYmQyODM3YmZkNzEwYzNlM2NhZDM3NGU2OGI4NTkz
+    ZGZmNTBjMGU1ZTU1Y2I5OGQ0MjEzMTAzMmY1NzlhODJjNzVkYzEzNDEwNGQx
+    OTk1OTllMWQ4NWRlZWY3MGM4NTFhY2E2NTdmYzRlNDgzZjAzZjg=

data/Changelog.md

@@ -1,6 +1,12 @@
 # Shop changelog
+
 ## Head
 
+## 0.1.9
+- Change template system to use `<%= %>` instead of `{{}}`
+- Creates the database in the `install` task
+- Fuck yeah autocompletion
+
 ## 0.1.8
 - By default the clean task clean the cache
 - Add a `template` section to the configuration file so you can use custom templates

data/Gemfile.lock

@@ -1,17 +1,28 @@
 PATH
   remote: .
   specs:
-    shop (0.1.8)
+    shop (0.1.9)
       highline (~> 1.6.19)
+      mysql2
 
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.2.4)
     highline (1.6.19)
+    mysql2 (0.3.13)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  rspec
   shop!
-  highline (~> 1.6.19)

data/README.md

@@ -1,9 +1,11 @@
-# Shop
+# Shop [![Build Status](https://secure.travis-ci.org/romainberger/shop.png)](http://travis-ci.org/romainberger/shop)
 
 CLI for easier [PrestaShop](http://www.prestashop.com/en/) development. Actually it's just for the lazy people.
 
 I always use Rakefiles and Makefiles for lots of tasks. With this gem you can use these tasks without having to create any *akefiles. For more infos about how and why see: [Introducing Shop](http://romainberger.com/2013/09/29/introducing-shop/).
 
+Shop has been developed to work with PrestaShop 1.5 and 1.4 (support for 1.6 will be added once it's realeased).
+
 ## Installation
 
     gem install shop
@@ -29,7 +31,7 @@ Download the latest stable version of PrestaShop in the current directory or in
 
 ### Installation
 
-Since 1.5.4 [PrestaShop provides a CLI](http://doc.prestashop.com/display/PS15/Installing+PrestaShop+using+the+command+line) to install your PrestaShop. You can try to remember every arguments, or just use the Shop task and stay relatively sane (no offense to the PrestaShop developers but... come on).
+Since 1.5.4 [PrestaShop provides a CLI](http://doc.prestashop.com/display/PS15/Installing+PrestaShop+using+the+command+line) to install your PrestaShop. You can try to remember every arguments, or just use the Shop task and stay relatively sane (no offense to the PrestaShop developers but... come on). The task will create the database if needed.
 
     # php install/cli.php --name=Romain --lol=whyamitypingallthis
     # nope
@@ -73,8 +75,6 @@ You can generate new pages for PrestaShop easily with the `controller` command.
     # example:
     shop controller CustomPage
 
-This task is adapted to work on PrestaShop 1.5 and 1.4.
-
 ### Modules
 
 **The modules related tasks will need the Shop project to be [initialized](https://github.com/romainberger/shop)**
@@ -162,6 +162,14 @@ You can edit this file with the command
 
 It will open the config file in your `$EDITOR`. It's YAML so it shouldn't be scary.
 
+## Custom templates
+
+Some tasks generates files, using templates located in [/templates](https://github.com/romainberger/shop/tree/master/templates). You can override these files to use custom ones. See the [template readme for more infos](https://github.com/romainberger/shop/tree/master/templates).
+
+## Autocompletion
+
+To enable autocompletion with Shop, [see the doc](https://github.com/romainberger/shop/tree/master/completion)
+
 ## Compatibility
 
 Shop has been developed and tested on osx. It may not work on platforms other than *nix, particularly the `new` command that uses the unix `unzip` command. I plan on working on rewriting this part with only Ruby so it could work everywhere. I'm not going to try it on Windows so feel free to open issues (or even better, contribute) if you notice something not working as expected.

data/Rakefile

@@ -1,6 +1,8 @@
 
 # Helper functions
 
+task :default => :test
+
 def name
   @name ||= Dir['*.gemspec'].first.split('.').first
 end
@@ -25,3 +27,7 @@ task :inst => [:build, :install]
 task :publish do
   system "gem push #{name}-#{version}.gem"
 end
+
+task :test do
+  system "bundle exec rspec test"
+end

data/lib/shop.rb

@@ -5,6 +5,7 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 require 'fileutils'
 require 'open-uri'
 require 'yaml'
+require 'mysql2'
 
 require 'highline/import'
 
@@ -15,5 +16,5 @@ require 'shop/platform'
 require 'shop/shopconfig'
 
 module Shop
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/lib/shop/command.rb

@@ -46,7 +46,7 @@ module Shop
         return init(major)                     if command == 'init'
         return install                         if command == 'install'
         return shopModule(major, minor, extra) if command == 'module'
-        return override(major, major, extra)   if command == 'override'
+        return override(major, minor, extra)   if command == 'override'
         return controller(major)               if command == 'controller'
         return clean(major)                    if command == 'clean'
         return jshint(major)                   if command == 'jshint'
@@ -55,6 +55,7 @@ module Shop
         return version                         if command == "-v"
         return version                         if command == "--version"
         return help                            if command == 'help'
+        return complete(major)                 if command == 'cmplt'
 
         puts "\n#{red("Error")}: Command not found"
         return help
@@ -65,11 +66,12 @@ module Shop
       def newProject(path)
         unless path.nil?
           FileUtils.mkpath(path)
+          puts "Creating new PrestaShop project in ./#{path}"
         else
           path = "./"
+          puts "Creating new PrestaShop project"
         end
 
-        puts "Please wait..."
         print "Downloading the framework... "
         url = 'https://github.com/PrestaShop/PrestaShop/archive/master.zip'
         open("master.zip", "wb") do |f|
@@ -147,8 +149,18 @@ module Shop
         command << "--email=#{entry[:email]} "
         command << "--newsletter=0"
 
+        # Creates the database if it doesn't exist
+        client = Mysql2::Client.new(
+          :host     => entry[:db_server],
+          :username => entry[:db_user],
+          :password => entry[:db_password]
+        )
+        puts "Creating the database..."
+        client.query("CREATE DATABASE IF NOT EXISTS `#{entry[:db_name]}`")
+        client.close()
+
         # run the php script
-        puts "Installing Prestashop please wait... "
+        puts "Installing Prestashop please wait..."
         system command
         done
       end
@@ -195,7 +207,7 @@ module Shop
             exit
           else
             puts "      #{green("create")} #{filepath}"
-            File.open(filepath, "w") do; end
+            File.open(filepath, "w")
           end
         elsif major == 'css'
           theme
@@ -211,7 +223,7 @@ module Shop
             exit
           elsif
             puts "      #{green("create")} #{filepath}"
-            File.open(filepath, "w") do; end
+            File.open(filepath, "w")
           end
         else
           # create a module
@@ -254,6 +266,7 @@ module Shop
       # Creates an override for controllers and classes
       def override(major, minor, extra)
         name = minor.capitalize
+
         if major == 'controller'
           # controller
           if !extra.nil? && extra == 'admin'
@@ -266,7 +279,6 @@ module Shop
           filename = "#{name}.php"
           path = "override/controllers/#{side}/#{filename}"
 
-
         elsif major == 'class'
           # class
           filename = "#{name}.php"
@@ -350,7 +362,7 @@ module Shop
 
         files.each do |f|
           puts "      #{green("create")} #{f}"
-          File.open(f, "w") do; end
+          File.open(f, "w")
         end
 
         clean("class")
@@ -379,7 +391,7 @@ module Shop
           if File.exists?(index)
             File.delete(index)
           end
-          File.open(index, "w") do; end
+          File.open(index, "w")
           # the file needs to be chmod'ed to 666
           File.chmod(0666, index)
         end
@@ -387,7 +399,6 @@ module Shop
         done
       end
 
-
       # Run jshint
       def jshint(major)
         theme
@@ -480,6 +491,26 @@ module Shop
         }.gsub(/^ {10}/, '')
         puts text
       end
+
+      # Method for the autocompletion
+      def complete(word)
+        complete = %{
+          new
+          init
+          install
+          module
+          module template
+          override
+          override controller
+          override class
+          controller
+          clean
+          clean class
+          jshint
+          makefile
+        }
+        puts complete
+      end
     end
   end
 end

data/lib/shop/template.rb

@@ -40,7 +40,7 @@ module Shop
       content = File.read(file)
 
       datas.each do |k, v|
-        k = "{{#{k}}}"
+        k = "<%= #{k} %>"
         content = content.gsub(k, v)
       end
       return content

data/shop.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'shop'
-  s.version           = '0.1.8'
-  s.date              = '2013-09-29'
+  s.version           = '0.1.9'
+  s.date              = '2013-10-02'
   s.rubyforge_project = 'shop'
 
   ## Make sure your summary is short. The description may be as long
@@ -51,9 +51,11 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('highline', "~> 1.6.19")
+  s.add_dependency('mysql2')
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
+  s.add_development_dependency('rspec')
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE

data/templates/Makefile

@@ -10,5 +10,5 @@ clean-class:
 
 clean-cache:
 	@printf "Cleaning cache..."
-	-@rm themes/{{theme}}/cache/*.css themes/{{theme}}/cache/*.js 2>/dev/null || true
+	-@rm themes/<%= theme %>/cache/*.css themes/<%= theme %>/cache/*.js 2>/dev/null || true
 	@echo "                   ${CHECK}"

data/templates/controller-1.4.php

@@ -1,18 +1,18 @@
 <?php
 
-class {{controller_name}}Core extends FrontController {
+class <%= controller_name %>Core extends FrontController {
 
     public function setMedia() {
         parent::setMedia();
 
-        Tools::addCSS(_THEME_CSS_DIR_.'{{name}}.css');
-        Tools::addJS(_THEME_JS_DIR_.'{{name}}.js');
+        Tools::addCSS(_THEME_CSS_DIR_.'<%= name %>.css');
+        Tools::addJS(_THEME_JS_DIR_.'<%= name %>.js');
     }
 
     public function displayContent() {
         parent::displayContent();
 
-        self::$smarty->display(_PS_THEME_DIR_.'{{name}}.tpl');
+        self::$smarty->display(_PS_THEME_DIR_.'<%= name %>.tpl');
     }
 
 }

data/templates/controller.php

@@ -1,12 +1,12 @@
 <?php
 
-class {{controller_name}}Core extends FrontController {
+class <%= controller_name %>Core extends FrontController {
 
     public function setMedia() {
         parent::setMedia();
 
-        $this->addCSS(_THEME_CSS_DIR_.'{{name}}.css');
-        $this->addJS(_THEME_JS_DIR_.'{{name}}.js');
+        $this->addCSS(_THEME_CSS_DIR_.'<%= name %>.css');
+        $this->addJS(_THEME_JS_DIR_.'<%= name %>.js');
     }
 
     /**
@@ -16,7 +16,7 @@ class {{controller_name}}Core extends FrontController {
     public function initContent() {
         parent::initContent();
 
-        $this->setTemplate(_PS_THEME_DIR_.'{{name}}.tpl');
+        $this->setTemplate(_PS_THEME_DIR_.'<%= name %>.tpl');
     }
 
 }

data/templates/module.php

@@ -1,12 +1,12 @@
 <?php
 
-class {{name_capitalize}} extends Module {
+class <%= name_capitalize %> extends Module {
 
     public function __construct() {
-        $this->name = '{{name}}';
-        $this->tab = '{{tab}}';
+        $this->name = '<%= name %>';
+        $this->tab = '<%= tab %>';
         $this->version = 0.1;
-        $this->author = '{{author}}';
+        $this->author = '<%= author %>';
 
         parent::__construct();
 

data/templates/page.php

@@ -1,4 +1,4 @@
 <?php
 
 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('{{controller_name}}')->run();
+ControllerFactory::getController('<%= controller_name %>')->run();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shop
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Romain Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-29 00:00:00.000000000 Z
+date: 2013-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -24,6 +24,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.19
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "CLI for the lazy people working on PrestaShop so you don't\n  have
   to type."
 email: romain@romainberger.com