jdt 0.0.2 → 0.0.3

data/.gitignore

@@ -4,3 +4,4 @@
 *.gem
 /tmp/
 .bundle
+/doc/

data/Gemfile.lock

@@ -2,29 +2,32 @@ PATH
   remote: .
   specs:
     jdt (0.0.2)
+      launchy
       nokogiri
       rubyzip
-      thor
+      thor (= 0.15.0.rc2)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.2.6)
     aruba (0.4.6)
       bcat (>= 0.6.1)
       childprocess (>= 0.2.0)
       cucumber (>= 1.0.2)
+      rdiscount (>= 1.6.8)
       rspec (>= 2.6.0)
     bcat (0.6.1)
       rack (~> 1.0)
     builder (3.0.0)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
-    cucumber (1.0.2)
+    cucumber (1.0.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.5)
+      gherkin (~> 2.4.18)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
+      term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     ffi (1.0.9-java)
     ffi (1.0.9-x86-mingw32)
@@ -34,10 +37,13 @@ GEM
       json (>= 1.4.6)
     json (1.5.4)
     json (1.5.4-java)
+    launchy (2.0.5)
+      addressable (~> 2.2.6)
     nokogiri (1.5.0-java)
     nokogiri (1.5.0-x86-mingw32)
     rack (1.3.2)
     rake (0.9.2)
+    rdiscount (1.6.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -48,7 +54,7 @@ GEM
     rspec-mocks (2.6.0)
     rubyzip (0.9.4)
     term-ansicolor (1.0.6)
-    thor (0.14.6)
+    thor (0.15.0.rc2)
 
 PLATFORMS
   java

data/bin/jdt

@@ -1,16 +1,3 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'jdt' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('jdt', 'jdt')
+require "rubygems"
+require "jdt/cli"
+Jdt::CLI.start

data/features/clean.feature

@@ -0,0 +1,2 @@
+Feature: clean
+

data/features/find.feature

@@ -0,0 +1,19 @@
+@wip
+Feature: find the manifest file
+
+  Scenario Outline: Not within an extension
+    Given the current directory is no extension directory
+    When I run `jdt.bat <status>`
+    Then the output should contain exactly "No manifest found\n"
+
+  Examples:
+    | status   |
+    | status   |
+    | clean    |
+    | build    |
+    | release  |
+    | manifest |
+    | validate |
+    | secure   |
+    | bump     |
+    | install  |

data/features/manifest.feature

@@ -1,25 +1,23 @@
 Feature: Manifest
 
-  Scenario: Not within an extension
-    Given the current directory is no extension directory
-    When I run `jdt.bat manifest`
-    Then the output should contain exactly "No manifest found\n"
-
   Scenario: Success
     Given a file named "manifest.xml" with:
-    """
-<?xml version="1.0" encoding="UTF-8"?>
-<extension type="library" version="1.7.0" method="upgrade">
-  <name>activerecord</name>
-  <version>1.0.0</version>
-</extension>
-    """
+      """
+      <?xml version="1.0" encoding="UTF-8"?>
+      
+      <extension type="library" version="1.7.0" method="upgrade">
+          <name>activerecord</name>
+
+        <version>1.0.0</version>
+      </extension>
+      """
     When I run `jdt.bat manifest`
     Then the output should contain exactly:
-"""
-<?xml version="1.0" encoding="UTF-8"?>
-<extension method="upgrade" type="library" version="1.7.0">
-  <name>activerecord</name>
-  <version>1.0.0</version>
-</extension>
-"""
+      """
+      <?xml version="1.0" encoding="UTF-8"?>
+      <extension type="library" version="1.7.0" method="upgrade">
+        <name>activerecord</name>
+        <version>1.0.0</version>
+      </extension>
+      
+      """

data/features/new.feature

@@ -1,97 +1,12 @@
 Feature: new
 
+  @wip
   Scenario: Create library
-    When I run `jdt new library test`
-    Then a directory named "lib_test" should exist
-    And a file named "test/manifest.xml" with:
-    """
-<?xml version="1.0" encoding="UTF-8"?>
-<extension method="upgrade" type="library" version="1.7.0">
-  <name>test</name>
-  <version>0.0.1</version>
-  <libraryname>test</libraryname>
-  
-</extension>
-    """
-    And a file named "test/test.php" with:
-    """
-
-    """
-
-  Scenario: Create plugin
-    When I run `jdt new plugin test`
-    Then a directory named "plg_test" should exist
-    And a file named "test/manifest.xml" with:
-    """
-<?xml version="1.0" encoding="UTF-8"?>
-<extension method="upgrade" type="library" version="1.7.0">
-  <name>test</name>
-  <version>0.0.1</version>
-  <libraryname>test</libraryname>
-
-</extension>
-    """
-    And a file named "test/test.php" with:
-    """
-
-    """
-
-  Scenario: Create template
-    When I run `jdt new template test`
-    Then a directory named "tpl_test" should exist
-    And a file named "tpl_test/manifest.xml" with:
-    """
-<?xml version="1.0" encoding="UTF-8"?>
-<extension method="upgrade" type="template" version="1.7.0">
-  <name>test</name>
-  <version>0.0.1</version>
-</extension>
-    """
-
-  Scenario: Create language
-    When I run `jdt new language test`
-    Then a directory named "lang_test" should exist
-    And a file named "lang_test/manifest.xml" with:
-    """
-<?xml version="1.0" encoding="UTF-8"?>
-<extension method="upgrade" type="language" version="1.7.0">
-  <name>test</name>
-  <version>0.0.1</version>
-</extension>
-    """
-
-  Scenario: Create module
-    When I run `jdt new module test`
-    Then a directory named "mod_test" should exist
-    And a file named "mod_test/manifest.xml" with:
-    """
-<?xml version="1.0" encoding="UTF-8"?>
-<extension method="upgrade" type="module" version="1.7.0">
-  <name>test</name>
-  <version>0.0.1</version>
-</extension>
-    """
-
-  Scenario: Create component
-    When I run `jdt new component test`
-    Then a directory named "com_test" should exist
-    And a file named "com_test/manifest.xml" with:
-    """
-<?xml version="1.0" encoding="UTF-8"?>
-<extension method="upgrade" type="module" version="1.7.0">
-  <name>test</name>
-  <version>0.0.1</version>
-</extension>
-    """
-
-  Scenario: Create package
-     When I run `jdt new package test`
-    Then a directory named "pkg_test" should exist
-    And a file named "pkg_test/manifest.xml" with:
-    """
-<?xml version="1.0" encoding="UTF-8"?>
-<extension method="upgrade" type="package" version="1.7.0">
-  <name>test</name>
-  <version>0.0.1</version>
-</extension>
-    """
+    When I successfully run `jdt.bat new library test`
+    Then the following directories should exist:
+    | lib_test           |
+    | lib_test/lib       |
+    And the following files should exist:
+    | lib_test/README    |
+    | lib_test/CHANGELOG |
+    | lib_test/test.php  |

data/features/release.feature

@@ -3,13 +3,6 @@ Feature: release
   In order to obtain a deployable zip file of the extension
   I as a CLI
 
-
-  Scenario: Not within an extension
-    Given the current directory is no extension directory
-    When I run `jdt.bat release`
-    Then the output should contain exactly "No manifest found\n"
-
-    
   Scenario: Success
     Given a file named "manifest.xml" with:
     """

data/features/status.feature

@@ -4,19 +4,56 @@ Feature: Status
   As a CLI
   I want to obtain the name, type and version of the extension
 
-  Scenario: Not within an extension
-    Given the current directory is no extension directory
-    When I run `jdt.bat status`
-    Then the output should contain exactly "No manifest found\n"
-
   Scenario: Status success
     Given a file named "manifest.xml" with:
     """
-<?xml version="1.0" encoding="UTF-8"?>
-<extension type="library" version="1.7.0" method="upgrade">
-  <name>activerecord</name>
-  <version>1.0.0</version>
-</extension>
+      <?xml version="1.0" encoding="UTF-8"?>
+      <extension type="library" version="1.7.0" method="upgrade">
+        <name>activerecord</name>
+        <version>1.0.0</version>
+      </extension>
+      """
+    When I run `jdt.bat status`
+    Then the output should contain exactly "Extension lib_activerecord-v1.0.0\n"
+
+  Scenario: Manifest found in directory named after itself with underscore
+    Given a directory named "lib_test"
+    And a file named "lib_test/test.xml" with:
+    """
+      <?xml version="1.0" encoding="UTF-8"?>
+      <extension type="library" version="1.7.0" method="upgrade">
+        <name>activerecord</name>
+        <version>1.0.0</version>
+      </extension>
+      """
+    And I cd to "lib_test"
+    When I run `jdt.bat status`
+    Then the output should contain exactly "Extension lib_activerecord-v1.0.0\n"
+
+  Scenario: Manifest found in directory named after itself with underscore
+    Given a directory named "test"
+    And a file named "test/test.xml" with:
+    """
+      <?xml version="1.0" encoding="UTF-8"?>
+      <extension type="library" version="1.7.0" method="upgrade">
+        <name>activerecord</name>
+        <version>1.0.0</version>
+      </extension>
+      """
+    And I cd to "test"
+    When I run `jdt.bat status`
+    Then the output should contain exactly "Extension lib_activerecord-v1.0.0\n"
+
+  Scenario: Manifest found in sub directory
+    Given a directory named "lib_test/subdir"
+    And a file named "lib_test/test.xml" with:
+    """
+      <?xml version="1.0" encoding="UTF-8"?>
+      <extension type="library" version="1.7.0" method="upgrade">
+        <name>activerecord</name>
+        <version>1.0.0</version>
+      </extension>
       """
+    And I cd to "lib_test/subdir"
     When I run `jdt.bat status`
     Then the output should contain exactly "Extension lib_activerecord-v1.0.0\n"

data/jdt.gemspec

@@ -17,8 +17,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "nokogiri"
-  s.add_dependency "thor"
+  s.add_dependency "thor","0.15.0.rc2"
   s.add_dependency "rubyzip"
+  s.add_dependency "launchy"
   s.add_development_dependency "rspec"
   s.add_development_dependency "cucumber"
   s.add_development_dependency "aruba"

data/lib/jdt/cli.rb

@@ -5,13 +5,14 @@ require "jdt/commands/bump"
 require "jdt/commands/install"
 require "jdt/commands/new"
 require "jdt/commands/pretty_print"
-#require "jdt/commands/secure"
+require "jdt/commands/secure"
 require "jdt/commands/status"
 require "jdt/commands/validate"
 require "jdt/commands/version"
 
 require "jdt/manifest"
 require "jdt/generator"
+require "jdt/xampp"
 
 module Jdt
 

data/lib/jdt/commands/build.rb

@@ -23,6 +23,16 @@ module Jdt
       end
     end
 
+    desc "clean","removes the /zip directory"
+    method_options :location => "."
+
+    def clean
+      handle_errors do
+        Manifest.find(options[:location]).clean
+        say "Everything is cleaned!"
+      end
+    end
+
   end
 
 end

data/lib/jdt/commands/new.rb

@@ -1,31 +1,53 @@
 require 'thor'
+require 'thor/group'
 require 'nokogiri'
 
 module Jdt
 
-  class CLI < Thor
-    include Thor::Actions
+  class GeneratorCLI < Thor
+
+    desc "component NAME", "generate component with NAME"
+
+    def component(name)
+      ComponentGenerator.new.generate(name)
+    end
+
+    desc "module NAME", "generate module with NAME"
+
+    def module(name)
+      ModuleGenerator.new.generate(name)
+    end
+
+    desc "plugin NAME", "generate plugin with NAME"
+
+    def plugin(name)
+      PluginGenerator.new.generate(name)
+    end
 
-    desc "new TYPE NAME", "creates a stub of TYPE with NAME"
-    method_options :location => "."
+    desc "language NAME", "generate language with NAME"
 
-    def new(type, name)
+    def language(name)
+      LanguageGenerator.new.generate(name)
+    end
 
-      handle_errors do
+    desc "template NAME", "generate template with NAME"
 
-        begin
-          generator = Generator.find(type.to_sym, name)
-          generator.location = options[:location]
-          generator.generate
-        rescue Jdt::ExtensionTypeNotFoundError
-          say("Given type is no Joomla extension type. Chose one of the available Joomla extension types:")
-          say("Extension types: #{Generator::GENERATORS.join(" ")}")
-        end
+    def template(name)
+      TemplateGenerator.new.generate(name)
+    end
 
-      end
-      
+    desc "library NAME", "generate library with NAME"
+
+    def library(name)
+      LibraryGenerator.new.generate(name)
     end
 
   end
 
+  class CLI < Thor
+    register Jdt::GeneratorCLI, :new, "new <command>", "Commands for new extensions"
+  end
+
+
+
 end

data/lib/jdt/config.rb

@@ -0,0 +1,77 @@
+require "fileutils"
+
+module Jdt
+
+  class Config
+
+    def initialize(file)
+
+      # ensure that folder exists
+      if (not File.exists?(directory))
+        FileUtils.makedirs(directory)
+      end
+
+      @file = file
+
+      # ensure that file exist
+      if (not File.exists?(yaml_file))
+        File.open(yaml_file, "w") do |f|
+          f << "\#YAML file for storing configuration information"
+        end
+      end
+    end
+
+    def directory
+      "#{ENV['HOME']}/.jdt"
+    end
+
+    def yaml_file
+      "#{directory}/#{@file}"
+    end
+
+    def yaml_props
+      props = YAML.load_file(yaml_file)
+      if (props)
+        props
+      else
+        Hash.new
+      end
+    end
+
+    def update
+      # read
+      props = yaml_props
+
+      # change
+      yield props
+
+      # write
+      File.open(yaml_file, "w") do |f|
+        f << props.to_yaml
+      end
+    end
+
+  end
+
+  class XamppConfig
+
+    def initialize
+      @yaml = Config.new("xampp.yml")
+    end
+
+    def xampp_path=(path)
+      @yaml.update do |props|
+        props["path"] = path
+      end
+    end
+
+    def xampp_path
+      @yaml.yaml_props["path"]
+    end
+
+    def htdocs_path
+      File.join(xampp_path,"htdocs")
+    end
+
+  end
+end

data/lib/jdt/generator/component_generator.rb

@@ -0,0 +1,92 @@
+module Jdt
+
+  class ComponentGenerator < Generator
+
+    def generate(name)
+      super
+
+      view_name = "#{name}"
+
+      empty_directory("#{folder}")
+      template('templates/component/manifest.xml.erb', "#{folder}/manifest.xml")
+      template('templates/component/script.php.erb', "#{folder}/script.php")
+
+      # site
+      site_dir = "#{folder}/site"
+      empty_directory("#{site_dir}")
+      template('templates/component/site/com_name.php.erb', "#{site_dir}/#{prefixed_name}.php")
+      template('templates/component/site/controller.php.erb', "#{site_dir}/controller.php")
+
+      #site view
+      empty_directory("#{site_dir}/views/")
+      empty_directory("#{site_dir}/views/#{view_name}")
+      template('templates/component/site/views/view_name/view.html.erb', "#{site_dir}/views/#{view_name}/view.html.php")
+      empty_directory("#{site_dir}/views/#{view_name}/tmpl")
+      template('templates/component/site/views/view_name/tmpl/default.php.erb', "#{site_dir}/views/#{view_name}/tmpl/default.php")
+      template('templates/component/site/views/view_name/tmpl/default.xml.erb', "#{site_dir}/views/#{view_name}/tmpl/default.xml")
+
+      #site models
+      empty_directory("#{site_dir}/models/")
+      template('templates/component/site/models/com_model_name.erb', "#{site_dir}/models/com_#{name}.php")
+
+      #site controllers
+      empty_directory("#{site_dir}/controllers/")
+
+      #site language
+      empty_directory("#{site_dir}/language/")
+      empty_directory("#{site_dir}/language/en-GB/")
+      empty_directory("#{site_dir}/language/de-DE/")
+
+      # admin
+      admin_dir = "#{folder}/admin"
+      empty_directory("#{admin_dir}")
+      template('templates/component/admin/access.xml.erb', "#{admin_dir}/access.xml")
+      template('templates/component/admin/config.xml.erb', "#{admin_dir}/config.xml")
+      template('templates/component/admin/com_name.php.erb', "#{admin_dir}/com_#{name}.php")
+      template('templates/component/admin/controller.php.erb', "#{admin_dir}/controller.php")
+
+      #admin views
+      empty_directory("#{admin_dir}/views/")
+      empty_directory("#{admin_dir}/views/#{view_name}")
+      template('templates/component/admin/views/view_name/view.html.erb', "#{admin_dir}/views/#{view_name}/view.html.php")
+      empty_directory("#{admin_dir}/views/#{view_name}/tmpl")
+      template('templates/component/admin/views/view_name/tmpl/default.php.erb', "#{admin_dir}/views/#{view_name}/tmpl/default.php")
+
+      #admin models
+      empty_directory("#{admin_dir}/models/")
+      empty_directory("#{admin_dir}/models/forms/")
+      empty_directory("#{admin_dir}/models/rules/")
+      empty_directory("#{admin_dir}/models/fields/")
+
+      #admin controllers
+      empty_directory("#{admin_dir}/controllers/")
+
+      #admin helpers
+      empty_directory("#{admin_dir}/helpers/")
+
+      #admin tables
+      empty_directory("#{admin_dir}/tables/")
+
+      #admin language
+      empty_directory("#{admin_dir}/language/")
+      empty_directory("#{admin_dir}/language/en-GB/")
+      empty_directory("#{admin_dir}/language/de-DE/")
+
+      #admin sql
+      empty_directory("#{admin_dir}/sql/")
+      empty_directory("#{admin_dir}/sql/updates/")
+
+    end
+
+    no_tasks {
+      def type
+        "component"
+      end
+
+      def type_short
+        "com"
+      end
+    }
+  end
+
+end