roject 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad19a40c37044d2c05db12edde1618900c5f2897
-  data.tar.gz: 4a7050a650334712f4d7b96b4b164e6229aa3404
+  metadata.gz: 5265b6ec336684e4ba63f8fb0348512446e55f16
+  data.tar.gz: 26971fbf99b1b2ccac6d935ab74acaebc78dcd3a
 SHA512:
-  metadata.gz: ba8034309255d69673d30b41c6044fe3c5369ed5fa73003139e58043bc939e43a6f41d258ed07aa422c28645035d0ddf1d0fcddae7382ec572536ea3d7868cee
-  data.tar.gz: 9757271c4518331712df7265bd6f2b00e1b01b23886a8ab20712da7a40141a57b9ed779955a1fefcbee80f225698694e4253349328cc8d53dee1fc8936ec413f
+  metadata.gz: c7fc1107661b11a7818ffb400fc1da28b76589eed4c78478ab85268cb4735f6669251ae9affb00b7e419631a857e908df01fddd232eb8c074f76187d75c1336c
+  data.tar.gz: 63de4a62904dbf091ce60006df1c5ad46be5be35b86ccc01ea50045640e3f61d067dad914b1a9d32a664dc8f44b28b8f9df316b8b65c10d4f056fd22b33674b9

data/exp/project/foobar.rb

@@ -0,0 +1,5 @@
+config project_name: "Foo",
+author: "Anshul Kharbanda",
+created: "7 - 24 - 2016",
+short_description: "Foo bar",
+long_description: "Foo bar baz ju jar jaz nu nar naz"

data/exp/project/project.rb

@@ -8,8 +8,6 @@ long_description: "Nowadays everybody wanna talk like" \
 " when they move their lips just a bunch of gibberish" \
 " and they all acting like they forgot about Dre."
 
-=begin
-
 #---------------------------MAKERS---------------------------
 
 # Header file
@@ -32,6 +30,4 @@ task :module do |args|
 	# Create source and header
 	make :header, args
 	make :source, args
-end
-
-=end
+end

data/lib/project.rb

@@ -28,6 +28,9 @@ module Roject
 		# Includes
 		include Helpers
 
+		# Default filename
+		FILENAME_DEFAULT = "project.rb"
+
 		# Default configuration
 		CONFIG_DEFAULT = {
 			project_name: "[project-name]",
@@ -43,9 +46,10 @@ module Roject
 		# Loads a Project from the project file with the given filename
 		# 
 		# Parameter: filename - the name of the file to parse
+		# 						(defaults to the default filename)
 		#
 		# Return: Project loaded from the file
-		def self.load filename
+		def self.load filename=FILENAME_DEFAULT
 			project = Roject::Project.new
 			project.instance_eval(IO.read(filename))
 			return project

data/lib/roject.rb

@@ -20,5 +20,5 @@ require_relative "project"
 # Created: 7 - 8 - 2016
 module Roject
 	# The Version of Roject
-	VERSION = "0.6.0"
+	VERSION = "0.7.0"
 end

data/spec/project_spec.rb

@@ -10,9 +10,7 @@ Author:  Anshul Kharbanda
 Created: 7 - 8 - 2016
 
 =end
-
-# Spec require
-require_relative "spec_require"
+require_relative "../lib/roject"
 
 # Describing Roject::Project
 #
@@ -28,7 +26,7 @@ describe Roject::Project do
 		@config = Roject::Project::CONFIG_DEFAULT.merge({
 			project_name: 	   "Foo",
 			author: 	  	   "Anshul Kharbanda",
-			created: 		   "7 - 23 - 2016",
+			created: 		   "7 - 24 - 2016",
 			short_description: "Foo bar",
 			long_description:  "Foo bar baz ju lar laz nu kar kaz"
 		})
@@ -38,9 +36,9 @@ describe Roject::Project do
 	#
 	# If a hash is given, sets the Project configuration to the hash.
 	# Else, returns the configuration of the Project.
-	#
+	# 
 	# Parameter: hash - the hash to configure the project with
-	#
+	# 
 	# Return: the configuration of the Project
 	describe '#config' do
 		context 'with no arguments given' do
@@ -65,9 +63,22 @@ describe Roject::Project do
 	#
 	# Return: Project loaded from the file
 	describe '::load' do
-		it 'loads a project from the given filename' do
-			expect{@project = Roject::Project.load "project.rb"}.not_to raise_error
-			expect(@project).to be_an_instance_of Roject::Project
+		context 'with a filename given' do
+			it 'loads a project from the given filename' do
+				expect{@project = Roject::Project.load("project.rb")}.not_to raise_error
+				expect(@project).to be_an_instance_of Roject::Project
+			end
+		end
+
+		context 'with no filename given' do
+			it 'loads a project from the default filename' do
+				expect{@project = Roject::Project.load}.not_to raise_error
+				expect(@project).to be_an_instance_of Roject::Project
+			end
+		end
+
+		after :all do
+			@project.instance_variable_set :@makers, {}
 		end
 	end
 
@@ -81,34 +92,34 @@ describe Roject::Project do
 		# Before all
 		before :all do
 			@path = "path/to/file"
+			@config = @project.config
 
 			# ----------------------FILE INFO----------------------
 
 			@header = {
-				name: :header,
-				path: "include/@(project_name)/@(path)",
-				template: "header.general",
+				name:      :header,
+				path:      "include/@(project_name)/@(path)",
+				template:  "header.general",
 				extension: "h",
-				out: "include/#{@project.config[:project_name]}/#{@path}.h",
-				text: IO.read("output/testheader.h")
+				out:       "include/#{@config[:project_name]}/#{@path}.h",
+				text:      IO.read("output/testheader.h")
 			}
 
 			@source = {
-				name: :source,
-				path: "src/@(path)",
-				template: "source.general",
+				name:      :source,
+				path:      "src/@(path)",
+				template:  "source.general",
 				extension: "cpp",
-				out: "src/#{@path}.cpp",
-				text: IO.read("output/testsource.cpp")
+				out:       "src/#{@path}.cpp",
+				text:      IO.read("output/testsource.cpp")
 			}
 
 			# ----------------------TASK INFO----------------------
 
 			@module = {
-				name: :module,
+				name:  :module,
 				block: Proc.new do |args|
 					args[:header_id] = c_header_id(args[:path])
-
 					make :header, args
 					make :source, args
 				end
@@ -138,7 +149,7 @@ describe Roject::Project do
 
 					# Template
 					expect(fmkr.instance_variable_get(:@template)).to be_an_instance_of General::GIO
-					expect(fmkr.instance_variable_get(:@template).source).to eql "#{@project.config[:directory][:templates]}/#{ft[:template]}"
+					expect(fmkr.instance_variable_get(:@template).source).to eql "#{@config[:directory][:templates]}/#{ft[:template]}"
 
 					# Extension
 					expect(fmkr.instance_variable_get(:@extension)).to eql ft[:extension]
@@ -206,4 +217,6 @@ describe Roject::Project do
 			after :each do FileUtils.rmtree ["include", "src"] end
 		end
 	end
+
+	after :all do Dir.chdir "../.." end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roject
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Anshul Kharbanda
@@ -14,56 +14,56 @@ dependencies:
   name: general
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 11.1.2
 description: Roject is a programming project manager written in Ruby. With Roject,
@@ -77,12 +77,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- exp/loadsaveable/foo.bar
-- exp/loadsaveable/foo.json
-- exp/loadsaveable/foo.yaml
-- exp/loadsaveable/foo.yml
 - exp/project/_templates/header.general
 - exp/project/_templates/source.general
+- exp/project/foobar.rb
 - exp/project/output/testheader.h
 - exp/project/output/testsource.cpp
 - exp/project/project.rb
@@ -91,7 +88,6 @@ files:
 - lib/project.rb
 - lib/roject.rb
 - spec/project_spec.rb
-- spec/spec_require.rb
 homepage: 
 licenses:
 - GPL-3.0

data/exp/loadsaveable/foo.bar

@@ -1 +0,0 @@
-project_name > project

data/exp/loadsaveable/foo.json

@@ -1,4 +0,0 @@
-{
-	"name": "project",
-	"author": "Anshul Kharbanda"
-}

data/exp/loadsaveable/foo.yaml

@@ -1,3 +0,0 @@
----
-name: project
-author: Anshul Kharbanda

data/exp/loadsaveable/foo.yml

@@ -1,3 +0,0 @@
----
-name: project
-author: Anshul Kharbanda

data/spec/spec_require.rb

@@ -1,15 +0,0 @@
-=begin 
-
-Program: Roject
-
-Roject is a programming project manager written in Ruby.
-With Roject, you can create and edit projects based on templates
-using simple commands without a heavy IDE.
-
-Author:  Anshul Kharbanda
-Created: 7 - 8 - 2016
-
-=end
-
-# Required files for spec
-require_relative "../lib/project"