requirejs_integrator 2.0.1 → 3.0.1

data/lib/requirejs_integrator.rb

@@ -1 +1,22 @@
+# encoding: utf-8
+
+# Copyright (C) 2015,2016 Szymon Kopciewski
+#
+# This file is part of RequirejsIntegrator.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "requirejs_integrator/version"
+require "requirejs_integrator/config"
 require "requirejs_integrator/tasks"

data/lib/requirejs_integrator/command/compile.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+
+# Copyright (C) 2015,2016 Szymon Kopciewski
+#
+# This file is part of RequirejsIntegrator.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "requirejs_integrator/command_template"
+
+module RequirejsIntegrator
+  module Command
+    class Compile < CommandTemplate
+      def run
+        @output.puts "*** Compile js files ***"
+        @executor.system "node #{rjs_path} -o \
+          #{config_file_path} \
+          appDir=#{app_dir_path} \
+          baseUrl=./ \
+          mainConfigFile=#{main_config_file_path} \
+          dir=#{destination_path}"
+      end
+
+      private
+
+      def rjs_path
+        File.join(Gem.datadir("requirejs_integrator"), "r.js.bundled")
+      end
+
+      def app_dir_path
+        File.join(
+          Rake.application.original_dir,
+          @config.fetch("project_ui_dir"),
+          @config.fetch("project_public_dir"),
+          @config.fetch("project_javascripts_dir")
+        )
+      end
+
+      def main_config_file_path
+        File.join(
+          app_dir_path,
+          "main.js"
+        )
+      end
+
+      def destination_path
+        File.join(
+          Rake.application.original_dir,
+          @config.fetch("project_ui_dir"),
+          @config.fetch("project_public_dir"),
+          @config.fetch("project_js_compressed_dir")
+        )
+      end
+    end
+  end
+end

data/lib/requirejs_integrator/command/generate_configuration.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+# Copyright (C) 2015,2016 Szymon Kopciewski
+#
+# This file is part of RequirejsIntegrator.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "requirejs_integrator/command_template"
+require "fileutils"
+
+module RequirejsIntegrator
+  module Command
+    class GenerateConfiguration < CommandTemplate
+      def run
+        config_dir = File.dirname config_file_path
+        return if File.exist?(config_file_path)
+        @output.puts "*** Creating default RequireJS configuration ***"
+        FileUtils.mkdir_p config_dir
+        FileUtils.cp default_config_file_path, config_file_path
+      end
+    end
+  end
+end

data/lib/requirejs_integrator/command_template.rb

@@ -0,0 +1,50 @@
+# encoding: utf-8
+
+# Copyright (C) 2015,2016 Szymon Kopciewski
+#
+# This file is part of RequirejsIntegrator.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+module RequirejsIntegrator
+  class CommandTemplate
+    def initialize(config:, output: $stdout, executor: ::Kernel)
+      @config = config
+      @output = output
+      @executor = executor
+    end
+
+    def run
+      raise NotImplementedError
+    end
+
+    private
+
+    def config_file_path
+      File.join(
+        Rake.application.original_dir,
+        @config.fetch("project_ui_dir"),
+        @config.fetch("project_config_dir"),
+        @config.fetch("project_requirejs_config_file")
+      )
+    end
+
+    def default_config_file_path
+      File.join(
+        Gem.datadir("requirejs_integrator"),
+        "build.js.default"
+      )
+    end
+  end
+end

data/lib/requirejs_integrator/config.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+# Copyright (C) 2015,2016 Szymon Kopciewski
+#
+# This file is part of RequirejsIntegrator.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require "piko_model"
+
+module RequirejsIntegrator
+  class Config < PikoModel::Model
+    field "project_javascripts_dir", default: "javascripts"
+    field "project_js_compressed_dir", default: "js"
+    field "project_ui_dir", default: "."
+    field "project_public_dir", default: "public"
+    field "project_config_dir", default: "config"
+    field "project_requirejs_config_file", default: "build.js"
+  end
+end

data/lib/requirejs_integrator/tasks.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (C) 2015 Szymon Kopciewski
+# Copyright (C) 2015,2016 Szymon Kopciewski
 #
 # This file is part of RequirejsIntegrator.
 #
@@ -17,5 +17,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-tasks_path = File.join(File.dirname(__FILE__), "tasks")
-Dir["#{tasks_path}/*.rake"].each { |ext| load ext } if defined?(Rake)
+module RequirejsIntegrator
+  module Tasks
+    class << self
+      attr_reader :config
+    end
+
+    def self.load(config)
+      @config = config
+      tasks_path = File.join(File.dirname(__FILE__), "tasks")
+      Dir["#{tasks_path}/*.rake"].each { |ext| ::Kernel.load(ext, true) } if defined?(::Rake)
+    end
+  end
+end

data/lib/requirejs_integrator/tasks/config.rake

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (C) 2015 Szymon Kopciewski
+# Copyright (C) 2015,2016 Szymon Kopciewski
 #
 # This file is part of RequirejsIntegrator.
 #
@@ -17,23 +17,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "system_executor"
-require "stdout_outputter"
+require "requirejs_integrator/command/generate_configuration"
 
 namespace :ri do
   desc "Install default r.js config"
   task :config do
-    default_config_path = File.join(
-      Gem.datadir("requirejs_integrator"),
-      "build_default.js"
-    )
-    current_path = Rake.application.original_dir
-    current_configdir_path = File.join(current_path, "config")
-    current_config_path = File.join(current_configdir_path, "build.js")
-    unless File.exist?(current_config_path)
-      StdoutOutputter::Outputter.new.write "*** Creating default r.js configuration ***"
-      SystemExecutor::Executor.new.run "mkdir -p #{current_configdir_path}"
-      SystemExecutor::Executor.new.run "cp #{default_config_path} #{current_config_path}"
-    end
+    RequirejsIntegrator::Command::GenerateConfiguration.new(
+      config: RequirejsIntegrator::Tasks.config
+    ).run
   end
 end

data/lib/requirejs_integrator/tasks/rjs.rake

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (C) 2015 Szymon Kopciewski
+# Copyright (C) 2015,2016 Szymon Kopciewski
 #
 # This file is part of RequirejsIntegrator.
 #
@@ -17,44 +17,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require "exec_executor"
-require "system_executor"
-require "stdout_outputter"
+require "requirejs_integrator/command/compile"
 
 namespace :ri do
   desc "Compile js"
   task :compile do
-    rjs_path = File.join(Gem.datadir("requirejs_integrator"), "r.js")
-    project_ui_dir = ENV["PROJECT_UI_DIR"] || "."
-    project_public_dir = ENV["PROJECT_PUBLIC_DIR"] || "public"
-    project_js_dir = ENV["PROJECT_JS_DIR"] || "javascripts"
-    project_rjs_dir = ENV["PROJECT_RJS_DIR"] || "js"
-    app_dir_path = File.join(
-      Rake.application.original_dir,
-      project_ui_dir,
-      project_public_dir,
-      project_js_dir
-    )
-    dir_path = File.join(
-      Rake.application.original_dir,
-      project_ui_dir,
-      project_public_dir,
-      project_rjs_dir
-    )
-    main_config_file_path = File.join(
-      Rake.application.original_dir,
-      project_ui_dir,
-      project_public_dir,
-      project_js_dir,
-      "main.js"
-    )
-    StdoutOutputter::Outputter.new.write "*** Compile js files ***"
-    SystemExecutor::Executor.new.run "node #{rjs_path} -o \
-      config/build.js \
-      appDir=#{app_dir_path} \
-      baseUrl=./ \
-      mainConfigFile=#{main_config_file_path} \
-      dir=#{dir_path}"
+    RequirejsIntegrator::Command::Compile.new(
+      config: RequirejsIntegrator::Tasks.config
+    ).run
   end
 
   task c: %w(compile)

data/lib/requirejs_integrator/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (C) 2015 Szymon Kopciewski
+# Copyright (C) 2015,2016 Szymon Kopciewski
 #
 # This file is part of RequirejsIntegrator.
 #
@@ -18,5 +18,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module RequirejsIntegrator
-  VERSION = "2.0.1"
+  VERSION = "3.0.1".freeze
 end

metadata

@@ -1,115 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: requirejs_integrator
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.1
 platform: ruby
 authors:
 - Szymon Kopciewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: exec_executor
+  name: piko_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: system_executor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: stdout_outputter
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   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'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   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'
 - !ruby/object:Gem::Dependency
-  name: rspec-given
+  name: minitest-reporters
   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'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: codeclimate-test-reporter
   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: The tasks for assets managment with requirejs
-email: s.kopciewski@gmail.com
+email:
+- s.kopciewski@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -118,9 +105,13 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- data/requirejs_integrator/build_default.js
-- data/requirejs_integrator/r.js
+- data/requirejs_integrator/build.js.default
+- data/requirejs_integrator/r.js.bundled
 - lib/requirejs_integrator.rb
+- lib/requirejs_integrator/command/compile.rb
+- lib/requirejs_integrator/command/generate_configuration.rb
+- lib/requirejs_integrator/command_template.rb
+- lib/requirejs_integrator/config.rb
 - lib/requirejs_integrator/tasks.rb
 - lib/requirejs_integrator/tasks/config.rake
 - lib/requirejs_integrator/tasks/rjs.rake
@@ -135,17 +126,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The tasks for assets managment with requirejs