arethusa-cli 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5c2ac3469acd770f86bb5129dc61fb5aa88f5e9
-  data.tar.gz: a9436334a79adc249731d5a827c696db057e61dc
+  metadata.gz: 9eb723e4851d58b50e479cec50f01c0f71d039f9
+  data.tar.gz: 51265087589544548b7d211fbd18df685083af46
 SHA512:
-  metadata.gz: 90e7a1fe4479bfcfe24f45a317901943e072c934d9550d2479e43bf49536d720cf4a6eaa5a3b76d5fbfabe8663bea0f0b7f9e3dbdc82dbc0f955f8e8a085d383
-  data.tar.gz: 39fa70bfcf8b020fc89fc0589972eac5127fa37a639e75a5cdb7978dac6a3a6ca3e8edda366190bcde9ec869a55702fe4e46b079bcffaa94c706bf3d7dd3aaa8
+  metadata.gz: 2cfe9c23328d69e48b8eca723754462e1239e9c3997250ea2887bfd4bc5178da148466fbe3025e6cd93407df5e240b1583d3fabff3feda846dc8fb5d5fc7b88e
+  data.tar.gz: b8ddfc16ffec9107f8865932f958ca78aa39dfeb63e559bcc54d61540cb071690321989d085cf6eae2fd66e39f8eb38a5992cd519abb9131951af9faebce2c51

data/lib/arethusa/cli/generator.rb

@@ -9,7 +9,6 @@ class Arethusa::CLI
     end
 
     include Thor::Actions
-    attr_reader :namespace
 
     desc 'plugin NAME', 'Creates a new Arethusa plugin skeleton'
     method_option :namespace, aliases: '-n', default: 'arethusa',
@@ -23,7 +22,6 @@ class Arethusa::CLI
       create_directories
       create_files
 
-      try('insert module into arethusa', :add_module)
       try('add to Gruntfile', :add_to_gruntfile)
       try('add module to index.html', :add_to_index)
 
@@ -43,26 +41,25 @@ class Arethusa::CLI
       @name = name
       @namespace = options[:namespace]
 
-      create_spec_file
+      empty_directory(spec_dir)
+      create_spec
 
       commit_changes if options[:commit]
       say_status(:success, "Created spec file for #{namespaced_name}")
     end
 
-    no_commands do
-      def name(js = false)
-        if js
-          to_camelcase(@name)
-        else
-          @name
-        end
-      end
+    desc 'retriever MODULE NAME', 'Create a new Arethusa retriever skeleton'
+    def retriever(mod, name)
+      @module = mod
+      @name = name
 
-      def to_camelcase(str)
-        parts = str.split('_')
-        first = parts.shift
-        "#{first}#{parts.map(&:capitalize).join}"
-      end
+      create_retriever
+      create_retriever_spec
+    end
+
+    no_commands do
+      include Helpers::NameHandler
+      include Helpers::DirectoriesAndFiles
 
       def try(message, method)
         puts
@@ -70,10 +67,6 @@ class Arethusa::CLI
         send(method)
       end
 
-      def namespaced_name(js = false)
-        [namespace, name(js)].compact.join('.')
-      end
-
       DIRECTORIES = %w{ plugin_dir template_dir }
       def create_directories
         DIRECTORIES.each { |dir| empty_directory(send(dir)) }
@@ -85,33 +78,6 @@ class Arethusa::CLI
         create_html_template
       end
 
-      def create_module
-        template('templates/module.tt', js_dir("#{namespaced_name}.js"))
-      end
-
-      def create_service
-        template('templates/service.tt', plugin_dir("#{name}.js"))
-      end
-
-      def create_html_template
-        template('templates/html_template.tt', html_template_file)
-      end
-
-      def create_spec_file
-        empty_directory(spec_dir)
-        template('templates/plugin_spec.tt', spec_dir("#{name}_spec.js"))
-      end
-
-      def add_module
-        insert_into_file(arethusa_main, after: /arethusa\.core',\n/, force: false) do
-          "  '#{namespaced_name(true)}',\n"
-        end
-      end
-
-      def arethusa_main
-        js_dir('arethusa.js')
-      end
-
       def add_to_gruntfile
         insert_into_file(gruntfile, after: /var arethusaModules.*?\n/, force: false) do
           %[  "#{namespaced_name}",\n]
@@ -145,30 +111,6 @@ It could look like this:
         puts text.lines.map { |line| "\t#{line}" }.join
       end
 
-      def plugin_dir(file = '')
-        File.join(js_dir, namespaced_name, file)
-      end
-
-      def template_dir(file = '')
-        File.join(temp_dir, namespaced_name, file)
-      end
-
-      def html_template_file
-        template_dir("#{name}.html")
-      end
-
-      def js_dir(file = '')
-        File.join(destination_root, 'app/js', file)
-      end
-
-      def temp_dir
-        File.join(destination_root, 'app/templates')
-      end
-
-      def spec_dir(file = '')
-        File.join(destination_root, 'spec', namespaced_name, file)
-      end
-
       def commit_changes(spec = false)
         sp = spec ? "spec " : ""
 

data/lib/arethusa/cli/helpers/directories_and_files.rb

@@ -0,0 +1,101 @@
+class Arethusa::CLI
+  module Helpers
+    module DirectoriesAndFiles
+      def template_path(name)
+        File.join(File.expand_path('../../templates/', __FILE__), name)
+      end
+
+      def plugin_dir(file = '')
+        File.join(js_dir, namespaced_name, file)
+      end
+
+      def template_dir(file = '')
+        File.join(temp_dir, namespaced_name, file)
+      end
+
+      def html_template_file
+        template_dir("#{name}.html")
+      end
+
+      def js_dir(file = '')
+        File.join(destination_root, 'app/js', file)
+      end
+
+      def temp_dir
+        File.join(destination_root, 'app/templates')
+      end
+
+      def spec_dir(file = '')
+        File.join(destination_root, 'spec', mod || namespaced_name, file)
+      end
+
+      def css_dir(file = '')
+        File.join(destination_root, 'app/css', file)
+      end
+
+      def conf_dir(file = '')
+        File.join(destination_root, 'app/static', 'configs', file)
+      end
+
+      def dist_dir(file = '')
+        File.join(destination_root, 'dist', file)
+      end
+
+      def create_module
+        template(template_path('module'), js_dir("#{namespaced_name}.js"))
+      end
+
+      def create_service
+        template(template_path('service'), plugin_dir("#{name}.js"))
+      end
+
+      def create_html_template
+        template(template_path('html_template'), html_template_file)
+      end
+
+      def create_spec
+        template(template_path('plugin_spec'), spec_dir("#{name}_spec.js"))
+      end
+
+      def create_gitignore
+        template(template_path('gitignore'), '.gitignore')
+      end
+
+      def create_jshintrc
+        template(template_path('jshintrc'), '.jshintrc')
+      end
+
+      def create_package
+        template(template_path('package'), 'package.json')
+      end
+
+      def create_bower
+        template(template_path('bower'), 'bower.json')
+      end
+
+      def create_gruntfile
+        template(template_path('gruntfile'), 'Gruntfile.js')
+      end
+
+      def create_scss
+        template(template_path('scss'), css_dir("#{namespaced_name}.scss"))
+      end
+
+      def create_index_file
+        template(template_path('index'), "app/index.html")
+      end
+
+      def create_conf_file
+        template(template_path('conf'), conf_dir('staging.json'))
+      end
+
+      def create_retriever
+        template(template_path('retriever'), js_dir(File.join(mod, "#{name}.js")))
+      end
+
+      def create_retriever_spec
+        template(template_path('retriever_spec'), spec_dir("#{name}_spec.js"))
+      end
+    end
+  end
+end

data/lib/arethusa/cli/helpers/name_handler.rb

@@ -0,0 +1,30 @@
+class Arethusa::CLI
+  module Helpers
+    module NameHandler
+      def namespaced_name(js = false, no_default = false)
+        ns = namespace(js);
+        ns = nil if no_default && @namespace == 'arethusa'
+        [ns, name(js)].compact.join('.')
+      end
+
+      def namespace(js = false)
+        js ? to_camelcase(@namespace) : @namespace
+      end
+
+      def name(js = false, capitalize = false)
+        js ? to_camelcase(@name, capitalize) : @name
+      end
+
+      def mod(js = false)
+        js ? to_camelcase(@module) : @module
+      end
+
+      def to_camelcase(str, capitalize = false)
+        parts = str.split('_')
+        first = parts.shift
+        first.capitalize! if capitalize
+        "#{first}#{parts.map(&:capitalize).join}"
+      end
+    end
+  end
+end

data/lib/arethusa/cli/templates/bower.tt

@@ -0,0 +1,10 @@
+{
+  "name" : "<%= namespaced_name %>",
+  "version" : "0.0.1",
+  "dependencies": {
+    "arethusa" : "latin-language-toolkit/arethusa#master"
+  },
+  "resolutions" : {
+    "angular" : "1.2.17"
+  }
+}

data/lib/arethusa/cli/templates/conf.tt

@@ -0,0 +1,127 @@
+{
+  "main" : {
+    "debug" : true,
+    "showKeys" : true,
+    "template"  : "templates/main_grid.html",
+    "retrievers" : {
+      "TreebankRetriever" : {
+        "resource" : "fakePerseids",
+        "docIdentifier" : "treebank",
+        "preselector" : "w"
+      }
+    },
+    "persisters" : {
+      "TreebankPersister" : {
+        "resource" : "fakePerseids",
+        "docIdentifier" : "treebank"
+      }
+    },
+    "plugins" : [
+      "text",
+      "artificialToken",
+      "search",
+      "morph",
+      "relation",
+      "depTree",
+      "review",
+      "history",
+      "comments"
+    ]
+  },
+
+  "navbar" : {
+    "template" : "templates/navbar1.html",
+    "search" : true,
+    "navigation" : true
+  },
+
+  "notifier" : {
+    "duration" : "5000",
+    "maxMessages" : 7
+  },
+
+  "resources" : {
+    "@include" : "../../../bower_components/arethusa/app/static/configs/resources/dev.json"
+  },
+
+  "plugins" : {
+    "text" : {
+      "main" : true,
+      "template"  : "templates/text2.html"
+    },
+
+    "depTree" : {
+      "main" : true,
+      "contextMenu" : true,
+      "contextMenuTemplate": "templates/arethusa.dep_tree/context_menu.html",
+      "template" : "templates/dep_tree.html"
+    },
+
+    "search" : {
+      "template" : "templates/search.html"
+    },
+
+    "morph" : {
+      "retrievers" : {
+        "BspMorphRetriever" : {
+          "resource" : "morphologyServiceLat"
+        }
+      },
+      "template"  : "templates/morph3.html",
+      "contextMenu" : true,
+      "contextMenuTemplate": "templates/arethusa.morph/context_menu.html",
+      "lexicalInventory" : {
+        "retriever" : {
+          "LexicalInventoryRetriever" : {
+            "resource" : "lexInvFusekiEndpoint"
+          }
+        }
+      },
+      "@include" : "../../../bower_components/arethusa/app/static/configs/morph/lat_attributes.json"
+    },
+
+    "relation" : {
+      "template" : "templates/relation.html",
+      "advancedMode" : true,
+      "contextMenu" : true,
+      "contextMenuTemplate": "templates/arethusa.relation/context_menu.html",
+      "@include" : "../../../bower_components/arethusa/app/static/configs/relation/relations.json"
+    },
+
+    "review" : {
+      "template" : "templates/arethusa.review/review.html",
+      "retrievers" : {
+        "TreebankRetriever" : {
+          "resource" : "fakeGold"
+        }
+      }
+    },
+
+    "history" : {
+      "maxSize" : 5,
+      "template" : "templates/history.html"
+    },
+
+    "artificialToken" : {
+      "template" : "templates/arethusa.artificial_token/artificial_token.html"
+    },
+
+    "comments" : {
+      "retriever" : {
+        "CommentsRetriever" : {
+          "resource" : "fakePerseidsComments"
+        }
+      }
+    }
+  },
+
+  "exitHandler" : {
+    "title" : "somewhere",
+    "route" : "http://www.:x.com",
+    "params" : ["x", "q"]
+  },
+
+  "keyCapture" : {
+    "@include" : "../../../bower_components/arethusa/app/static/configs/keyboard/key_map.json"
+  }
+}

data/lib/arethusa/cli/templates/gitignore.tt

@@ -0,0 +1,8 @@
+node_modules/*
+bower_components/*
+*.swp
+coverage
+dist/
+deployment/
+.sass-cache
+app/css/*.css*

data/lib/arethusa/cli/templates/gruntfile.tt

@@ -0,0 +1,179 @@
+"use strict";
+
+var srcFiles = 'app/**/*.js';
+var htmlFiles = 'app/**/*.html';
+var cssFiles = 'app/**/*.scss';
+var specFiles = 'spec/**/*.js';
+var devServerPort = 8081;
+var reloadPort = 35279;
+var confPath = 'app/static/configs';
+var arethusaPackages = 'bower_components/arethusa/dist/arethusa_packages.min.js';
+var arethusaFiles = 'bower_components/arethusa/dist/arethusa.min.js';
+var specHelpers = 'bower_components/arethusa/spec/helpers/**/*';
+
+module.exports = function(grunt) {
+  require('load-grunt-tasks')(grunt);
+
+  function confFiles() {
+    return grunt.file.expand(confPath + '/*.json');
+  }
+
+  function confMergeCommands() {
+    var file, target, cmd, cmds = [];
+    var files = confFiles();
+    for (var i = files.length - 1; i >= 0; i--){
+      file = files[i];
+      target = file.replace(confPath, 'dist/configs');
+      cmd = 'arethusa merge ' + file + ' -m > ' + target;
+      cmds.push(cmd);
+    }
+    return cmds;
+  }
+
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    jasmine: {
+      src: srcFiles,
+      options: {
+        specs: specFiles
+      }
+    },
+    karma: {
+      spec: {
+        autoWatch: false,
+        singleRun: true,
+        options: {
+          files : [
+            arethusaPackages,
+            'bower_components/angular-mocks/angular-mocks.js',
+            specHelpers,
+            arethusaFiles,
+            srcFiles,
+            specFiles
+          ],
+          frameworks: ['jasmine'],
+          browsers : ['PhantomJS'],
+          plugins : [
+            'karma-chrome-launcher',
+            'karma-phantomjs-launcher',
+            'karma-firefox-launcher',
+            'karma-jasmine',
+            'karma-coverage'
+          ],
+          reporters: ['progress', 'coverage'],
+          preprocessors: {
+            'app/**/*.js': ['coverage']
+          },
+          coverageReporter: {
+            reporters: [
+              {type: 'html', dir:'coverage/'},
+              {type: 'lcov'},
+            ]
+          }
+        }
+      },
+    },
+    coveralls: {
+      src: 'coverage/**/lcov.info'
+    },
+    uglify: {
+      options: {
+        sourceMap: true
+      },
+      '<%= namespaced_name %>' : {
+        files: {
+          'dist/<%= namespaced_name %>.min.js' : [
+            'app/js/<%= namespaced_name %>.js',
+            'app/js/<%= namespaced_name %>/**/*.js',
+            'app/templates/<%= namespaced_name %>/compiled/<%= namespaced_name %>.templates.js'
+          ]
+        }
+      }
+    },
+    sass: {
+      dist: {
+        options: {
+          sourcemap: true
+        },
+        files: {
+          'app/css/<%= namespaced_name %>.css': 'app/css/<%= namespaced_name %>.scss'
+        }
+      }
+    },
+    cssmin: {
+      css: {
+        src: 'app/css/**/*.css',
+        dest: 'dist/<%= namespaced_name %>.min.css'
+      }
+    },
+    ngtemplates : {
+      '<%= namespaced_name %>' : {
+        cwd: 'app',
+        src: 'templates/**/*.html',
+        dest: 'app/templates/<%= namespaced_name %>/compiled/<%= namespaced_name %>.templates.js'
+      }
+    },
+    connect: {
+      devServer: {
+        options: {
+          port: devServerPort,
+          debug: true,
+          keepalive: true,
+          livereload: reloadPort,
+          middleware: function(connect) {
+            return [
+              require('connect-livereload')(),
+              connect.static(require('path').resolve('./'))
+            ];
+          }
+        }
+      },
+    },
+    watch: {
+      spec: {
+        files: [srcFiles, htmlFiles, specFiles],
+        tasks: 'karma:spec'
+      },
+      server: {
+        files: [srcFiles, htmlFiles, cssFiles],
+        tasks: 'minify',
+        options: {
+          spawn: false,
+          livereload: reloadPort
+        }
+      },
+    },
+    jshint: {
+      options: {
+        jshintrc: true,
+      },
+      all: ['*.js', srcFiles, specFiles]
+    },
+    shell: {
+      minifyConfs: {
+        command: confMergeCommands().join('&')
+      }
+    },
+    concurrent: {
+      minify: {
+        tasks: [ 'minify:src', 'minify:css', 'minify:conf' ]
+      },
+      server: {
+        tasks: ['watch:server', 'server'],
+        options: {
+          logConcurrentOutput: true
+        }
+      }
+    }
+  });
+
+  grunt.registerTask('minify:src', ['ngtemplates', 'uglify']);
+  grunt.registerTask('minify:css', ['sass', 'cssmin']);
+  grunt.registerTask('minify:conf', 'shell:minifyConfs');
+  grunt.registerTask('minify', ['concurrent:minify']);
+
+  grunt.registerTask('spec', 'watch:spec');
+  grunt.registerTask('server', ['minify', 'connect:devServer']);
+  grunt.registerTask('reload-server', 'concurrent:server');
+  grunt.registerTask('default', ['karma:spec', 'jshint']);
+};

data/lib/arethusa/cli/templates/index.tt

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html ng-app="arethusa" ng-di-strict>
+<head>
+  <link rel="stylesheet" href="../bower_components/arethusa/dist/arethusa.min.css">
+  <link rel="stylesheet" href="../bower_components/arethusa/vendor/foundation-icons/foundation-icons.css">
+  <link rel="stylesheet" href="../bower_components/arethusa/vendor/font-awesome-4.1.0/css/font-awesome.min.css">
+
+  <script src="../bower_components/arethusa/dist/arethusa_packages.min.js"></script>
+  <script src="../bower_components/arethusa/dist/arethusa.min.js"></script>
+
+  <script>
+    arethusa.setBasePath('../bower_components/arethusa')
+  </script>
+
+  <meta charset="UTF-8">
+  <title></title>
+</head>
+<body key-capture>
+  <div id="arethusa-main-view"  class="fade very-slow" ng-view></div>
+</body>
+</html>

data/lib/arethusa/cli/templates/jshintrc.tt

@@ -0,0 +1,33 @@
+{
+  "globalstrict" : true,
+  "browser" : true,
+  "jquery" : true,
+  "undef" : true,
+  "multistr" : true,
+  "globals" : {
+    "angular" : false,
+    "d3" : false,
+    "lunr" : true,
+    "arethusaUtil" : true,
+    "aU": true,
+    "arethusaMocks" : true,
+    "arethusaLogger" : true,
+    "UserVoice" : true,
+    "inject" : false,
+    "module" : false,
+    "require" : false,
+    "describe" : false,
+    "ddescribe" : false,
+    "xdescribe" : false,
+    "beforeEach" : false,
+    "afterEach" : false,
+    "it" : false,
+    "iit" : false,
+    "xit" : false,
+    "expect" : false,
+    "browser" : false,
+    "by" : false,
+    "element" : false,
+    "process" : false
+  }
+}

data/lib/arethusa/cli/templates/module.tt

@@ -1,2 +1,2 @@
 "use strict";
-angular.module('<%= namespaced_name(true) %>', ['arethusa.core']);
+angular.module('<%= namespaced_name(true) %>', []);

data/lib/arethusa/cli/templates/package.tt

@@ -0,0 +1,30 @@
+{
+  "name": "<%= namespaced_name %>",
+  "version": "0.0.1",
+  "dependencies" : {},
+  "devDependencies": {
+    "grunt-cli": "0.1.13",
+    "grunt-angular-templates": "0.5.6",
+    "grunt-contrib-jasmine": "0.6.3",
+    "grunt-contrib-watch": "0.6.1",
+    "grunt-contrib-jshint": "0.10.0",
+    "grunt-contrib-connect": "~0.7.1",
+    "grunt-coveralls": "0.3.0",
+    "grunt-karma": "0.8.0",
+    "grunt-contrib-uglify": "0.4.0",
+    "grunt-contrib-cssmin": "0.10.0",
+    "grunt-concurrent": "0.5.0",
+    "karma-chrome-launcher": "0.1.3",
+    "karma-phantomjs-launcher": "0.1.4",
+    "karma-firefox-launcher": "0.1.3",
+    "karma-jasmine": "0.1.5",
+    "karma-coverage": "0.2.1",
+    "bower": "1.3.8",
+    "connect-livereload": "0.4.0",
+    "execSync": "latest",
+    "load-grunt-tasks": "^0.6.0",
+    "grunt-contrib-sass": "0.7.3",
+    "grunt-shell": "0.7.0",
+    "grunt-contrib-concat": "~0.5.0"
+  }
+}

data/lib/arethusa/cli/templates/plugin_spec.tt

@@ -1,21 +1,24 @@
 "use strict";
 
 describe('<%= name(true) %>', function() {
-  var <%= name(true) %>, state;
+  var <%= name(true) %>;
+
+  var conf = {};
 
   beforeEach(function() {
-    module("arethusa.core", function($provide) {
-      $provide.value('configurator', arethusaMocks.configurator());
-    });
+    module("arethusa.core");
 
-    module("<%= namespaced_name(true) %>");
+    module('<%= namespaced_name(true) %>');
 
-    inject(function(_<%= name(true) %>_, _state_) {
+    inject(function(_<%= name(true) %>_, configurator) {
       <%= name(true) %> = _<%= name(true) %>_;
-      state = _state_;
-      state.tokens = arethusaMocks.tokens();
+      configurator.defineConfiguration(conf);
+      <%= name(true) %>.init();
     });
   });
 
   // Write your specs here!
+  it('succeeds to load the plugin', function() {
+    expect(<%= name(true) %>).toBeDefined();
+  });
 });

data/lib/arethusa/cli/templates/retriever.tt

@@ -0,0 +1,18 @@
+"use strict";
+
+angular.module('<%= mod(true) %>').factory('<%= name(true, true) %>', [
+  'configurator',
+  function(configurator) {
+    return function(conf) {
+      var self = this;
+      var resource = configurator.provideResource(conf.resource);
+
+      this.get = function(callback) {
+        resource.get().then(function(res) {
+          var data = res.data;
+          callback(data);
+        });
+      };
+    };
+  }
+]);

data/lib/arethusa/cli/templates/retriever_spec.tt

@@ -0,0 +1,46 @@
+"use strict";
+
+describe('<%= name(true, true) %>', function() {
+  var retriever, backend;
+
+  var backendUrl = '';
+
+  var conf = {
+    resources: {
+      testResource: {
+        route: backendUrl
+      }
+    }
+  };
+
+  beforeEach(function() {
+    module('arethusa.core');
+    module('<%= mod(true) %>');
+
+    inject(function($httpBackend, configurator, locator) {
+      backend = $httpBackend;
+      configurator.defineConfiguration(conf);
+      retriever = configurator.getRetriever({
+        <%= name(true, true) %> : {
+          resource: 'testResource' 
+        }
+      });
+      locator.watchUrl(false);
+      locator.set({});
+    });
+  });
+
+  describe('get', function() {
+    it('...', function() {
+      var response = {};
+
+      backend.when('GET', backendUrl).respond(response);
+
+      // Your GET code goes here!
+
+      backend.flush();
+
+      // Your first expectation goes here!
+    });
+  });
+});

data/lib/arethusa/cli/templates/scss.tt

@@ -0,0 +1 @@
+@import '../../bower_components/bourbon/dist/bourbon';

data/lib/arethusa/cli/templates/service.tt

@@ -5,18 +5,16 @@ angular.module('<%= namespaced_name(true) %>').service('<%= name(true) %>', [
   'configurator',
   function(state, configurator) {
     var self = this;
+    this.name = '<%= namespaced_name(true, true) %>';
 
     this.defaultConf = {
-      name: '<%= name(true) %>',
-      template: 'templates/<%= namespaced_name %>/<%= name %>.html'
-    }
+      template: 'templates/<%= namespaced_name(false, true) %>/<%= name %>.html'
+    };
 
     function configure() {
-      configurator.getConfAndDelegate('<%= name(true) %>', self);
+      configurator.getConfAndDelegate(self);
     }
 
-    configure();
-
     this.init = function() {
       configure();
     };

data/lib/arethusa/cli/version.rb

@@ -1,5 +1,5 @@
 module Arethusa
   class CLI
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/arethusa/cli.rb

@@ -4,6 +4,8 @@ require 'json'
 module Arethusa
   class CLI < Thor
     require 'arethusa/cli/version'
+    require 'arethusa/cli/helpers/name_handler'
+    require 'arethusa/cli/helpers/directories_and_files'
     require 'arethusa/cli/subcommand'
 
     require 'arethusa/cli/generator'
@@ -11,6 +13,10 @@ module Arethusa
 
     include Thor::Actions
 
+    def self.source_root
+      File.join(File.dirname(__FILE__), 'cli')
+    end
+
     register(Generator, Generator.namespace, "#{Generator.namespace} [ACTION]", 'Generates Arethusa files. Call "arethusa generate" to learn more')
     register(Transformer, Transformer.namespace, "#{Transformer.namespace} [ACTION]", 'Tranforms Alpheios conf files. Call "arethusa transform" to learn more')
 
@@ -77,7 +83,69 @@ EOF
       end
     end
 
+    desc 'init NAMESPACE NAME', 'Initializes a new git repo for plugin development'
+    def init(namespace, name)
+      @name = name
+      @namespace = namespace
+
+      inside namespaced_name do
+        init_git
+        create_folder_hierarchy
+        create_templates
+        initial_commit
+        install
+      end
+    end
+
     no_commands do
+      include Helpers::NameHandler
+      include Helpers::DirectoriesAndFiles
+
+      def init_git
+        if `git init`
+          say_status(:success, "Initialized new repo in #{namespaced_name}")
+        end
+      end
+
+      def initial_commit
+        `git add -A`
+        `git commit -m 'Initial commit'`
+      end
+
+      def create_folder_hierarchy
+        dirs = [
+          plugin_dir, template_dir, template_dir('compiled'),
+          css_dir, conf_dir, dist_dir, dist_dir('configs')
+        ]
+        dirs.each { |dir| empty_directory(dir) }
+      end
+
+      def create_templates
+        create_module
+        create_service
+        create_html_template
+        create_spec
+        create_scss
+        create_gitignore
+        create_jshintrc
+        create_package
+        create_bower
+        create_gruntfile
+        create_index_file
+        create_conf_file
+      end
+
+      def install
+        `npm install && bower install && gem install sass -v 3.3.14`
+
+        # We have to minify Arethusa by hand for now - this won't be needed
+        # at a later stage.
+        inside 'bower_components/arethusa' do
+          `npm install && bower install`
+          `grunt minify:all`
+        end
+      end
+
       def minify
         if `grunt minify:all`
           say_status(:success, 'minified Arethusa')
@@ -168,14 +236,20 @@ EOF
           elsif key == '@include'
             additional_conf = read_conf(value)
             conf.delete(key)
-            conf.merge!(additional_conf)
-            traverse(additional_conf)
+            if additional_conf
+              conf.merge!(additional_conf)
+              traverse(additional_conf)
+            end
           end
         end
       end
 
       def read_conf(path)
-        JSON.parse(File.read(path))
+        begin
+          JSON.parse(File.read(path))
+        rescue
+          nil
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arethusa-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - LFDM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,10 +114,22 @@ files:
 - lib/arethusa.rb
 - lib/arethusa/cli.rb
 - lib/arethusa/cli/generator.rb
+- lib/arethusa/cli/helpers/directories_and_files.rb
+- lib/arethusa/cli/helpers/name_handler.rb
 - lib/arethusa/cli/subcommand.rb
+- lib/arethusa/cli/templates/bower.tt
+- lib/arethusa/cli/templates/conf.tt
+- lib/arethusa/cli/templates/gitignore.tt
+- lib/arethusa/cli/templates/gruntfile.tt
 - lib/arethusa/cli/templates/html_template.tt
+- lib/arethusa/cli/templates/index.tt
+- lib/arethusa/cli/templates/jshintrc.tt
 - lib/arethusa/cli/templates/module.tt
+- lib/arethusa/cli/templates/package.tt
 - lib/arethusa/cli/templates/plugin_spec.tt
+- lib/arethusa/cli/templates/retriever.tt
+- lib/arethusa/cli/templates/retriever_spec.tt
+- lib/arethusa/cli/templates/scss.tt
 - lib/arethusa/cli/templates/service.tt
 - lib/arethusa/cli/transformer.rb
 - lib/arethusa/cli/version.rb