konstruct 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee931a7380555cf3c1c3c8a22b7c7738250d53ab
-  data.tar.gz: 10b2369bca9a06902c37284a4915fd2847da42ac
+  metadata.gz: 448b0f15ca6388daa5f14b522de161da3a593872
+  data.tar.gz: ef2afffd57c2a69661a19142d2d997e73e8ac3ad
 SHA512:
-  metadata.gz: c52c6f189a2c3bc867018411f1a93feecfd30c864df5e084de51731b54eedba130ac3049d47d8ede6b9cb01d0442a99b8defdb2e8ff715495bfbd02b3dd095bb
-  data.tar.gz: 9124dff1088f4daee812fd655eab1c1515bec873e3b2084405011e36bce143314262b93ace76b5bba73c3ffe51cda17662834a8dc524bca5a2c3fee6fdf4b2ea
+  metadata.gz: 3453f66ccb87e815b13d7607bcf9aa87d2bfa31306819990416f193bfc389f0e74c96e528703d1d4e1024b7b33de8ace618b24c0ef200559339d9818ca5feb69
+  data.tar.gz: 308f0a1e7c288e73cee9dffaa1e5276b284fabcec93a9fa7498d5b7f9c48ce712c17a03c2aef40a9e8fa5222c7773c8d67899de5b25c86230131295418e1c1ba

data/README.md

@@ -24,17 +24,17 @@ The Cli has a few very simple commands. If you get stuck simply `$ konstruct --h
     
 This feature is coming soon.
 
-#### Gulp
+#### Develop
     
-    $ konstruct gulp
+    $ konstruct develop
     
-Runs a default Gulp 
+Determines the type of site you are building, and runs gulp tasks accordingly.
 
-#### Skeleton
+#### Project
 
-    $ konstruct skeleton
+    $ konstruct project
     
-The skeleton command builds a basic starter project template for common website projects. It builds common folders to ensure your project is tidy and organised.
+The project command builds a basic starter project template for common website projects. It builds common folders to ensure your project is tidy and organised.
 
 #### Stat
     

data/lib/cli/{gulp.rb → develop.rb}

@@ -12,7 +12,7 @@ module Konstruct
    
     class Cli
         
-        def gulp(path)
+        def develop(path)
             
             # B.1. INITIALISE FUNCTIONS -------------------------------------------------------------------------------
             
@@ -22,9 +22,26 @@ module Konstruct
             
             # B.1. END ------------------------------------------------------------------------------------------------
             
-            # B.2. RUN DEFAULT WATCH TASK -----------------------------------------------------------------------------
+            # B.2. DETERMINE WHAT TOOL TO RUN -------------------------------------------------------------------------
             
-            gulp.default(path)
+            site = fs.read_json(path)
+            type = site['type']
+            
+            if type == "Default" || type == "Angular"
+               
+                serving = true
+                
+                gulp.default(path, serving)
+                
+            end
+            
+            if type == "Jekyll"
+               
+                serving = false
+                
+                gulp.default(path, serving)
+                
+            end
             
             # B.2. END ------------------------------------------------------------------------------------------------
             

data/lib/konstruct.rb

@@ -18,6 +18,7 @@ require 'paint'
 require 'launchy'
 require 'minigit'
 require 'json'
+require 'pp'
 
 # A.1. END ------------------------------------------------------------------------------------------------------------
 
@@ -35,7 +36,7 @@ require_relative 'cli/scaffold'
 require_relative 'cli/project'
 require_relative 'cli/documentation'
 require_relative 'cli/init'
-require_relative 'cli/gulp'
+require_relative 'cli/develop'
 
 # A.2. END ------------------------------------------------------------------------------------------------------------
 
@@ -137,14 +138,14 @@ end
 
 # -- USAGE: $ konstruct documentation
 
-command :gulp do |c|
+command :develop do |c|
     
-    c.syntax = 'konstruct gulp'
-    c.summary = 'Launches Konstruct Gulp tasks while you develop.'
-    c.description = 'Launches Konstruct Gulp tasks while you develop.'
+    c.syntax = 'konstruct develop'
+    c.summary = 'Launches Konstruct dev tools to help you build things quicker.'
+    c.description = 'Launches Konstruct dev tools to help you build things quicker.'
     c.action do |args, options|
-
-        cli.gulp(projectDir)
+        
+        cli.develop(projectDir)
 
     end
 

data/lib/konstruct/version.rb

@@ -1,3 +1,3 @@
 module Konstruct
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/utilities/gulp.rb

@@ -16,7 +16,7 @@ module Util
         
         # A.1.1. GULP DEFAULT
        
-        def default(path)
+        def default(path, serving)
             
             gulp = Util::Gulp.new()
             msg = Util::Message.new()
@@ -24,8 +24,18 @@ module Util
             gulp_path = File.expand_path('~/.konstruct/gulp')
             
             FileUtils.cd(gulp_path) do
+                
+                if serving == true
                     
-                exec "gulp --path #{path}"
+                    exec "gulp --path #{path}"
+                    
+                else 
+                   
+                    msg.heading("Run `$ jekyll serve --watch` in a new terminal window.")
+                    
+                    exec "gulp --noserve --path #{path}"
+                    
+                end
 
             end
             

data/lib/utilities/utils.rb

@@ -177,7 +177,7 @@ module Util
         
         # B.2.3. END
         
-        # B.2.3. CLEAN DIRECTORY
+        # B.2.3. MAKE DIRECTORY
         
         def make_dir(dir)
             
@@ -194,6 +194,19 @@ module Util
         
         # B.2.3. END
         
+        # B.2.4. READ JSON FILE
+        
+        def read_json(path)
+            
+            msg = Util::Message.new()
+            
+            json = File.read("#{path}/.konstruct/data.json")
+            obj = JSON.parse(json)
+            
+        end
+        
+        # B.2.4. END
+        
     end
     
     # B.2. END --------------------------------------------------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konstruct
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Adrian Kirsten
@@ -130,8 +130,8 @@ files:
 - bin/konstruct
 - bin/setup
 - konstruct.gemspec
+- lib/cli/develop.rb
 - lib/cli/documentation.rb
-- lib/cli/gulp.rb
 - lib/cli/init.rb
 - lib/cli/project.rb
 - lib/cli/scaffold.rb