qbuild 0.1.0.pre1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d471087792d1c18ca03c886977539c6def82be3a
-  data.tar.gz: 458551e8a399f47d2c0d1a124eef0b7a4f4e8f63
+  metadata.gz: c0950972156cdc46e57489743403c62f5815e280
+  data.tar.gz: 3eade37f1d566130f4a31ad1349599d0c6ae0218
 SHA512:
-  metadata.gz: b76333ff9ed4dad58a42530244d3fc7bec18c2a8df1e90a30574a0a4add470a145ff98a16ba7a6ba307eaaf9d91673177795c4384a54bca506601a2770b458ee
-  data.tar.gz: 05aae8452a81961b3c91aa27f83efb0d8248d85509ce665fea3a2edfea584f3426b7451fd8a07b6a62aad8f273ea2d9f306cd75f2e0b6f604a7d94bd9fdb8a4c
+  metadata.gz: f1c46340f454eb02224cc3dc33323f49519a47c6e4b349f5febc1ad540afb3002139266efbf3625e97647563d664b50df92b0c1c577d8a154710db66505f9955
+  data.tar.gz: e4b75dce9394c5fb9de85526b09054f6f8dc949cd22fc0dd589199890ec38c513c5c71fbd93e56a70c247ac61978657d3765d3124a2afe0bc795d8ed0aa1a8e8

data/COC.md

@@ -1,3 +1,3 @@
 # Code of Conduct
 
-Just don't be a dick.
+Don't be a dick.

data/lib/assets/.qbuild.json

@@ -2,15 +2,12 @@
     "js_paths": [
         "scripts"
     ],
-    "stylesheets_paths": [
-        "stylesheets"
+    "minified_js_path": "scripts",
+    "stylesheet_filenames": [
+        "stylesheets/style.scss"
     ],
+    "minified_stylesheets_path": "stylesheets",
     "stylesheet_name": "style.min.css",
-    "pre_build": [
-        "ls -lah",
-        "echo Starting build..."
-    ],
-    "post_build": [
-        "echo Build finished!"
-    ]
+    "pre_build": [],
+    "post_build": []
 }

data/lib/qbuild.rb

@@ -1,6 +1,8 @@
 require_relative 'qbuild/version'
 require_relative 'qbuild/config'
 require_relative 'qbuild/jshandler'
+require_relative 'qbuild/stylesheet_handler'
+require_relative 'qbuild/build_action'
 
 module Qbuild
   def self.main(arg)
@@ -10,6 +12,8 @@ module Qbuild
       display_version
     elsif arg[0] == '--options' || arg[0] == '-o'
       display_options
+    elsif arg[0] == 'run'
+      build_this_thing
     else
       display_help
     end
@@ -20,9 +24,34 @@ module Qbuild
   def self.init
     Qbuild::Config.init
     puts
-    PadUtils.puts_c "Qbuild initialized.", :green
+    PadUtils.puts_c 'Qbuild initialized.', :green
     PadUtils.puts_c "Update options in '.qbuild.json'"
     puts
+  rescue
+    PadUtils.puts_c 'Something went really wrong.', :red
+  end
+
+  def self.build_this_thing
+    start_time = Time.now
+    puts
+    unless Qbuild::Config.pre_build.nil? || Qbuild::Config.pre_build.empty?
+      PadUtils.puts_c 'Running pre-build scripts...', :green
+      Qbuild::BuildAction.run_pre_build_actions
+    end
+    PadUtils.puts_c 'Minifying JavaScript...', :green
+    Qbuild::Jshandler.minify_js
+    PadUtils.puts_c 'Converting Sass & minifying CSS...', :green
+    Qbuild::StylesheetHandler.transpile_and_minify_style
+    unless Qbuild::Config.post_build.nil? || Qbuild::Config.post_build.empty?
+      PadUtils.puts_c 'Running post-build scripts...', :green
+      Qbuild::BuildAction.run_post_build_actions
+    end
+    end_time = Time.now
+    interval = PadUtils.interval(start_time, end_time, :seconds)
+    puts
+    PadUtils.puts_c "Completed in #{interval} seconds!", :green
+  rescue
+    PadUtils.puts_c 'Something went really wrong.', :red
   end
 
   def self.display_options
@@ -32,12 +61,18 @@ module Qbuild
       puts "- #{path}"
     end
 
-    stylesheets_paths = Qbuild::Config.stylesheets_paths
-    PadUtils.puts_c 'stylesheets_paths:', :blue
-    stylesheets_paths.each do |path|
+    stylesheet_filenames = Qbuild::Config.stylesheet_filenames
+    PadUtils.puts_c 'stylesheet_filenames:', :blue
+    stylesheet_filenames.each do |path|
       puts "- #{path}"
     end
 
+    PadUtils.puts_c 'minified_js_path:', :blue
+    puts "- #{Qbuild::Config.minified_js_path}"
+
+    PadUtils.puts_c 'minified_stylesheets_path', :blue
+    puts "- #{Qbuild::Config.minified_stylesheets_path}"
+
     PadUtils.puts_c 'stylesheet_name:', :blue
     puts "- #{Qbuild::Config.stylesheet_name}"
 

data/lib/qbuild/build_action.rb

@@ -0,0 +1,21 @@
+module Qbuild
+  module BuildAction
+    def self.run_pre_build_actions
+      actions = Qbuild::Config.pre_build
+      unless actions.nil?
+        actions.each do |action|
+          system action.to_s
+        end
+      end
+    end
+
+    def self.run_post_build_actions
+      actions = Qbuild::Config.post_build
+      unless actions.nil?
+        actions.each do |action|
+          system action.to_s
+        end
+      end
+    end
+  end
+end

data/lib/qbuild/config.rb

@@ -1,9 +1,14 @@
 require 'pad_utils'
+require 'fileutils'
 
 module Qbuild
   module Config
     INIT_CONFIG_FILE = "#{File.dirname(__FILE__)}/../assets/.qbuild.json".freeze
 
+    def self.create_target_directory(dir_name)
+      FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
+    end
+
     def self.init
       PadUtils.copy_file(INIT_CONFIG_FILE, '.')
     end
@@ -12,8 +17,16 @@ module Qbuild
       read_key(:js_paths)
     end
 
-    def self.stylesheets_paths
-      read_key(:stylesheets_paths)
+    def self.minified_js_path
+      read_key(:minified_js_path)
+    end
+
+    def self.minified_stylesheets_path
+      read_key(:minified_stylesheets_path)
+    end
+
+    def self.stylesheet_filenames
+      read_key(:stylesheet_filenames)
     end
 
     def self.stylesheet_name

data/lib/qbuild/jshandler.rb

@@ -1,19 +1,26 @@
 require 'uglifier'
 require 'pad_utils'
-require_relative 'config_reader'
+require_relative 'config'
 
-module Jshandler
-  def self.minify_js
-    js_path = ConfigReader.options[:js_path]
-    Dir["#{js_path}/*.js"].each do |file|
-      unless file.include? '.min.js'
-        jsmin = Uglifier.new.compile(File.read(file))
-        File.write(name_min_file(file), jsmin)
+module Qbuild
+  module Jshandler
+    def self.minify_js
+      js_paths = Qbuild::Config.js_paths
+      min_js_path = Qbuild::Config.minified_js_path
+      Qbuild::Config.create_target_directory(min_js_path)
+      js_paths.each do |js_path|
+        Dir["#{js_path}/*.js"].each do |file|
+          unless file.include? '.min.js'
+            jsmin = Uglifier.new.compile(File.read(file))
+            File.write("#{min_js_path}/#{name_min_file(file)}", jsmin)
+          end
+        end
       end
     end
-  end
 
-  def self.name_min_file(file)
-    file.gsub(/(.*)(.js)(.*)/, '\1.min.js\3')
+    def self.name_min_file(file)
+      file = File.basename file
+      file.gsub(/(.*)(.js)(.*)/, '\1.min.js\3')
+    end
   end
 end

data/lib/qbuild/stylesheet_handler.rb

@@ -0,0 +1,30 @@
+require 'sass'
+require 'pad_utils'
+
+module Qbuild
+  module StylesheetHandler
+    def self.transpile_and_minify_style
+      style_formats = ['.css', '.scss']
+      style_filenames = Qbuild::Config.stylesheet_filenames
+      min_style_path = Qbuild::Config.minified_stylesheets_path
+      min_style_file = Qbuild::Config.stylesheet_name
+      Qbuild::Config.create_target_directory(min_style_path)
+      content = ''
+      style_filenames.each do |file|
+        next unless PadUtils.file_exist?(file)
+        next unless style_formats.include? File.extname(file)
+        next if file.include? '.min.css'
+        content += "\n#{File.read(file)}"
+      end
+      minified = scss_to_css content
+      File.write("#{min_style_path}/#{min_style_file}", minified)
+    end
+
+    def self.scss_to_css(content)
+      sass_engine = Sass::Engine.new(content, style: :compressed,
+                                              syntax: :scss,
+                                              cache: false)
+      sass_engine.render
+    end
+  end
+end

data/lib/qbuild/version.rb

@@ -1,3 +1,3 @@
 module Qbuild
-  VERSION = "0.1.0.pre1"
+  VERSION = '0.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qbuild
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre1
+  version: 0.1.0
 platform: ruby
 authors:
 - Nico Schuele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pad_utils
@@ -84,9 +84,10 @@ files:
 - bin/qbuild
 - lib/assets/.qbuild.json
 - lib/qbuild.rb
+- lib/qbuild/build_action.rb
 - lib/qbuild/config.rb
-- lib/qbuild/config_reader.rb
 - lib/qbuild/jshandler.rb
+- lib/qbuild/stylesheet_handler.rb
 - lib/qbuild/version.rb
 homepage: https://github.com/nicoschuele/qbuild
 licenses:
@@ -103,9 +104,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/lib/qbuild/config_reader.rb

@@ -1,23 +0,0 @@
-require 'pad_utils'
-
-module ConfigReader
-  def self.options
-    opts = {}
-    unless PadUtils.file_exist?('.qbuild.json')
-      opts = { js_path: 'scripts', scss_path: 'stylesheets', css_path: 'stylesheets', css_file: 'style.min.css' }
-      return opts
-    end
-    conf = read_config
-    opts = {
-      js_path: conf[:js_path],
-      scss_path: conf[:scss_path],
-      css_path: conf[:css_path],
-      css_file: conf[:css_file]
-    }
-    opts
-  end
-
-  def self.read_config
-    PadUtils.json_file_to_hash('.qbuild.json')
-  end
-end