generamba 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86031870069f4fd70b4aab732b9cd8b3b148bd73
-  data.tar.gz: 5cfaf9db6ee20956d3ca39a3540ed60ca1680437
+  metadata.gz: fa6d08c063acbc143e6bb207b57f3ff29335003f
+  data.tar.gz: 75be1fd6927e0a08bf3d9dc122925166abbfb654
 SHA512:
-  metadata.gz: 5e11bd68fe9b713a03773084ff0aaf91584fb6fae2ec01eba3136b8ff8dda3d9b1d8c348f7d11ba4a4988570c9009c6be8a0247c6d8c299321aeb7d1926de349
-  data.tar.gz: 6488c2d30051969a72b09eca9da7c99f9382b13dee0c642d5cbb70be0791863f021719e51559e3ffb1a3edda8db4c26303aed04c8588e02bbff78d5143874100
+  metadata.gz: 0c532fd9d76a7714fae9d7083849b41516bab539554195cb4e9a3f69dbceb3d63b076950732fd2a37676c564d73a7e0e4aebcb1d49f0ea6b2ef7ef6d68cdad95
+  data.tar.gz: 2b4bfa45e3fcc56debd966132ff98b09c239a52472a3fbdcc5113e816c977425133aeb2b1b50779ee67e6d8f313959866b5813ab100fcb0446036a5bd6468fb3

data/generamba.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'xcodeproj', '0.28.2'
   spec.add_runtime_dependency 'liquid', '3.0.6'
   spec.add_runtime_dependency 'tilt', '2.0.1'
-  spec.add_runtime_dependency 'settingslogic', '2.0.9'
   spec.add_runtime_dependency 'git', '1.2.9.1'
 
   spec.add_development_dependency 'bundler', '~> 1.10'

data/lib/generamba/cli/gen_command.rb

@@ -34,8 +34,10 @@ module Generamba::CLI
       default_module_description = "#{module_name} module"
       module_description = options[:description] ? options[:description] : default_module_description
 
+      rambafile = YAML.load_file(RAMBAFILE_NAME)
+
       template = ModuleTemplate.new(template_name)
-      code_module = CodeModule.new(module_name, module_description, options)
+      code_module = CodeModule.new(module_name, module_description, rambafile, options)
 
       generator = Generamba::ModuleGenerator.new()
       generator.generate_module(module_name, code_module, template)

data/lib/generamba/cli/setup_command.rb

@@ -24,17 +24,11 @@ module Generamba::CLI
       properties[PROJECT_NAME_KEY] = is_right_project_name ? project_name : ask_non_empty_string('The project name:', 'Project name should not be empty')
       properties[PROJECT_PREFIX_KEY]  = ask('The project prefix (if any):')
 
-      project_files = Dir['*.xcodeproj']
-      count = project_files.count
-      if count == 1
-        is_right_path = yes?("The path to a .xcodeproj file of the project is #{project_files[0]}. Do you want to use it? (yes/no)")
-        xcode_path = is_right_path ? project_files[0] : ask('The path to a .xcodeproj file of the project:')
-      else
-        xcode_path = ask('The path to a .xcodeproj file of the project:')
-      end
+      xcodeproj_path = ask_file_with_path('*.xcodeproj',
+                                          '.xcodeproj file of the project')
 
-      properties[XCODEPROJ_PATH_KEY] = xcode_path
-      project = Xcodeproj::Project.open(xcode_path)
+      properties[XCODEPROJ_PATH_KEY] = xcodeproj_path
+      project = Xcodeproj::Project.open(xcodeproj_path)
 
       targets_prompt = ''
       project.targets.each_with_index { |element, i| targets_prompt += ("#{i}. #{element.name}" + "\n") }
@@ -56,8 +50,17 @@ module Generamba::CLI
         test_file_path = ask('The default path for creating tests (in the filesystem):')
       end
 
-      properties[PODFILE_PATH_KEY]  = ask('The Podfile path (if any):')
-      properties[CARTFILE_PATH_KEY]  = ask('The Cartfile path (if any):')
+      using_pods = yes?('Are you using Cocoapods? (yes/no)')
+      if using_pods
+        properties[PODFILE_PATH_KEY] = ask_file_with_path('Podfile',
+                                                          'Podfile')
+      end
+
+      using_carthage = yes?('Are you using Carthage? (yes/no)')
+      if using_carthage
+        properties[CARTFILE_PATH_KEY] = ask_file_with_path('Cartfile',
+                                                           'Cartfile')
+      end
 
       properties[PROJECT_TARGET_KEY] = project_target.name
       properties[PROJECT_FILE_PATH_KEY] = project_file_path

data/lib/generamba/cli/thor_extension.rb

@@ -29,6 +29,19 @@ module Generamba::CLI
           puts(description.red)
         end
       end
+
+      def ask_file_with_path(pattern, message_file_name)
+        project_files = Dir[pattern]
+        count = project_files.count
+        default_message = "The path to a #{message_file_name}:"
+        if count == 1
+          is_right_path = yes?"The path to a #{message_file_name} is '#{project_files[0]}'. Do you want to use it? (yes/no)"
+          xcode_path = is_right_path ? project_files[0] : ask(default_message)
+        else
+          xcode_path = ask(default_message)
+        end
+        return xcode_path
+      end
     end
   end
 end

data/lib/generamba/code_generation/Rambafile.liquid

@@ -26,9 +26,9 @@ test_file_path: {{ test_file_path }}{% endif %}
 {% if test_group_path != "" %}# The Xcode group path to new tests
 test_group_path: {{ test_group_path }}{% endif %}
 
-{% if podfile_path != "" or cartfile_path != "" %}### Dependencies settings section{% endif %}
-{% if podfile_path != "" %}podfile_path: {{ podfile_path }}{% endif %}
-{% if cartfile_path != "" %}cartfile_path: {{ cartfile_path }}{% endif %}
+{% if podfile_path != nil or cartfile_path != nil %}### Dependencies settings section{% endif %}
+{% if podfile_path != nil %}podfile_path: {{ podfile_path }}{% endif %}
+{% if cartfile_path != nil %}cartfile_path: {{ cartfile_path }}{% endif %}
 
 ### Templates
 templates:

data/lib/generamba/code_generation/code_module.rb

@@ -4,6 +4,12 @@ module Generamba
   class CodeModule
     attr_reader :name,
                 :description,
+                :author,
+                :company,
+                :year,
+                :prefix,
+                :project_name,
+                :xcodeproj_path,
                 :module_file_path,
                 :module_group_path,
                 :test_file_path,
@@ -11,115 +17,45 @@ module Generamba
                 :project_targets,
                 :test_targets
 
-    def initialize(name, description, options)
+    def initialize(name, description, rambafile, options)
+      # Base initialization
       @name = name
       @description = description
 
-      @project_targets = options[:module_targets].split(',') if options[:module_targets]
-      @test_targets = options[:test_targets].split(',') if options[:test_targets]
-
-      @module_file_path = Pathname.new(options[:module_file_path]) if options[:module_file_path]
-      @module_group_path = Pathname.new(options[:module_group_path]) if options[:module_group_path]
-      @test_file_path = Pathname.new(options[:test_file_path]) if options[:test_file_path]
-      @test_group_path = Pathname.new(options[:test_group_path]) if options[:test_group_path]
-
-      # The priority is given to `module_path` and 'test_path' options
-      @module_file_path = Pathname.new(options[:module_path]) if options[:module_path]
-      @module_group_path = Pathname.new(options[:module_path]) if options[:module_path]
-      @test_file_path = Pathname.new(options[:test_path]) if options[:test_path]
-      @test_group_path = Pathname.new(options[:test_path]) if options[:test_path]
-    end
-
-    def author
-      Generamba::UserPreferences.obtain_username
-    end
-
-    def company
-      ProjectConfiguration.company
-    end
-
-    def year
-      Time.now.year.to_s
-    end
-
-    def prefix
-      ProjectConfiguration.prefix
-    end
-
-    def project_name
-      ProjectConfiguration.project_name
-    end
-
-    def module_file_path
-      return @module_file_path != nil ?
-          @module_file_path :
-          Pathname.new(ProjectConfiguration.project_file_path)
-              .join(@name)
-    end
-
-    def module_group_path
-      return @module_group_path != nil ?
-          @module_group_path :
-          Pathname.new(ProjectConfiguration.project_group_path)
-              .join(@name)
-    end
-
-    def test_file_path
-      if @test_file_path == nil
-        if ProjectConfiguration.test_file_path == nil
-          return nil
-        end
+      @author = UserPreferences.obtain_username
+      @company = rambafile[COMPANY_KEY]
+      @year = Time.now.year.to_s
 
-        return Pathname.new(ProjectConfiguration.test_file_path)
-                   .join(@name)
-      end
-      return @test_file_path
-    end
+      @prefix = rambafile[PROJECT_PREFIX_KEY]
+      @project_name = rambafile[PROJECT_NAME_KEY]
+      @xcodeproj_path = rambafile[XCODEPROJ_PATH_KEY]
 
-    def test_group_path
-      if @test_group_path == nil
-        if ProjectConfiguration.test_group_path == nil
-          return nil
-        end
+      @module_file_path = Pathname.new(rambafile[PROJECT_FILE_PATH_KEY]).join(@name)
+      @module_group_path = Pathname.new(rambafile[PROJECT_GROUP_PATH_KEY]).join(@name)
 
-        return Pathname.new(ProjectConfiguration.test_group_path)
-                   .join(@name)
-      end
-      return @test_group_path
-    end
+      @test_file_path = Pathname.new(rambafile[TEST_FILE_PATH_KEY]).join(@name) if rambafile[TEST_FILE_PATH_KEY] != nil
+      @test_group_path = Pathname.new(rambafile[TEST_GROUP_PATH_KEY]).join(@name) if rambafile[TEST_GROUP_PATH_KEY] != nil
 
-    def project_targets
-      targets = Array.new
-      if ProjectConfiguration.project_target != nil
-        targets = [ProjectConfiguration.project_target]
-      end
+      @project_targets = [rambafile[PROJECT_TARGET_KEY]] if rambafile[PROJECT_TARGET_KEY] != nil
+      @project_targets = rambafile[PROJECT_TARGETS_KEY] if rambafile[PROJECT_TARGETS_KEY] != nil
 
-      if ProjectConfiguration.project_targets != nil
-        targets = ProjectConfiguration.project_targets
-      end
+      @test_targets = [rambafile[TEST_TARGET_KEY]] if rambafile[TEST_TARGET_KEY] != nil
+      @test_targets = rambafile[TEST_TARGETS_KEY] if rambafile[TEST_TARGETS_KEY] != nil
 
-      if @project_targets != nil
-        targets = @project_targets
-      end
-
-      return targets
-    end
-
-    def test_targets
-      targets = Array.new
-      if ProjectConfiguration.test_target != nil
-        targets = [ProjectConfiguration.test_target]
-      end
-
-      if ProjectConfiguration.test_targets != nil
-        targets = ProjectConfiguration.test_targets
-      end
+      # Options adaptation
+      @project_targets = options[:module_targets].split(',') if options[:module_targets]
+      @test_targets = options[:test_targets].split(',') if options[:test_targets]
 
-      if @test_targets != nil
-        targets = @test_targets
-      end
+      @module_file_path = Pathname.new(options[:module_file_path]).join(@name) if options[:module_file_path]
+      @module_group_path = Pathname.new(options[:module_group_path]).join(@name) if options[:module_group_path]
+      @test_file_path = Pathname.new(options[:test_file_path]).join(@name) if options[:test_file_path]
+      @test_group_path = Pathname.new(options[:test_group_path]).join(@name) if options[:test_group_path]
 
-      return targets
+      # The priority is given to `module_path` and 'test_path' options
+      @module_file_path = Pathname.new(options[:module_path]).join(@name) if options[:module_path]
+      @module_group_path = Pathname.new(options[:module_path]).join(@name) if options[:module_path]
+      @test_file_path = Pathname.new(options[:test_path]).join(@name) if options[:test_path]
+      @test_group_path = Pathname.new(options[:test_path]).join(@name) if options[:test_path]
     end
   end
 end

data/lib/generamba/code_generation/module_template.rb

@@ -1,5 +1,4 @@
 require 'generamba/helpers/template_helper.rb'
-require 'settingslogic'
 
 module Generamba
 
@@ -9,11 +8,11 @@ module Generamba
 
     def initialize(name)
       spec_path = TemplateHelper.obtain_spec(name)
-      spec = Settingslogic.new(spec_path)
+      spec = YAML.load_file(spec_path)
 
       @code_files = spec[TEMPLATE_CODE_FILES_KEY]
       @test_files = spec[TEMPLATE_TEST_FILES_KEY]
-      @template_name = spec.name
+      @template_name = spec[TEMPLATE_NAME_KEY]
       @template_path = TemplateHelper.obtain_path(name)
     end
   end

data/lib/generamba/module_generator.rb

@@ -9,7 +9,7 @@ module Generamba
 
 		def generate_module(name, code_module, template)
 			# Setting up Xcode objects
-			project = XcodeprojHelper.obtain_project(ProjectConfiguration.xcodeproj_path)
+			project = XcodeprojHelper.obtain_project(code_module.xcodeproj_path)
 
 			# Configuring file paths
 			FileUtils.mkdir_p code_module.module_file_path
@@ -62,7 +62,7 @@ module Generamba
 				# The target file's name consists of three parameters: project prefix, module name and template file name.
 				# E.g. RDS + Authorization + Presenter.h = RDSAuthorizationPresenter.h
 				file_basename = name + File.basename(file[TEMPLATE_NAME_KEY])
-				prefix = ProjectConfiguration.prefix
+				prefix = code_module.prefix
 				file_name = prefix ? prefix + file_basename : file_basename
 
 				file_group = File.dirname(file[TEMPLATE_NAME_KEY])

data/lib/generamba/template/helpers/rambaspec_validator.rb

@@ -1,5 +1,3 @@
-require 'settingslogic'
-
 module Generamba
 
   # Provides methods that validate .rambaspec file existance and structure
@@ -13,7 +11,7 @@ module Generamba
     # @return [Bool]
     def self.validate_spec_existance(template_name, template_path)
       local_spec_path = self.obtain_spec_path(template_name, template_path)
-      rambaspec_exist = File.file?(local_spec_path)
+      File.file?(local_spec_path)
     end
 
     # Validates the structure of a .rambaspec file for a given template
@@ -24,9 +22,13 @@ module Generamba
     # @return [Bool]
     def self.validate_spec(template_name, template_path)
       spec_path = self.obtain_spec_path(template_name, template_path)
-      spec = Settingslogic.new(spec_path)
+      spec = YAML.load_file(spec_path)
 
-      is_spec_valid = spec.name != nil && spec.author != nil && spec.version != nil && spec.code_files != nil
+      is_spec_valid =
+          spec[TEMPLATE_NAME_KEY] != nil &&
+          spec[TEMPLATE_AUTHOR_KEY] != nil &&
+          spec[TEMPLATE_VERSION_KEY] != nil &&
+          spec[TEMPLATE_CODE_FILES_KEY] != nil
       return is_spec_valid
     end
 
@@ -40,8 +42,8 @@ module Generamba
     # @return [Bool]
     def self.obtain_spec_path(template_name, template_path)
       spec_filename = template_name + RAMBASPEC_EXTENSION
-      full_path = Pathname.new(template_path)
-                      .join(spec_filename)
+      Pathname.new(template_path)
+          .join(spec_filename)
     end
   end
 end

data/lib/generamba/version.rb

@@ -1,3 +1,3 @@
 module Generamba
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/lib/generamba.rb

@@ -7,7 +7,6 @@ module Generamba
   require 'generamba/cli/cli.rb'
   require 'generamba/code_generation/code_module.rb'
   require 'generamba/code_generation/module_template.rb'
-  require 'generamba/configuration/project_configuration'
   require 'generamba/code_generation/content_generator.rb'
   require 'generamba/code_generation/rambafile_generator.rb'
   require 'generamba/module_generator.rb'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generamba
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Egor Tolstoy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -67,20 +67,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: settingslogic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +159,6 @@ files:
 - lib/generamba/code_generation/content_generator.rb
 - lib/generamba/code_generation/module_template.rb
 - lib/generamba/code_generation/rambafile_generator.rb
-- lib/generamba/configuration/project_configuration.rb
 - lib/generamba/configuration/user_preferences.rb
 - lib/generamba/constants/constants.rb
 - lib/generamba/constants/rambafile_constants.rb

data/lib/generamba/configuration/project_configuration.rb

@@ -1,10 +0,0 @@
-require 'settingslogic'
-
-module Generamba
-
-  # A singletone class representing a Rambafile of the current project
-  class ProjectConfiguration < Settingslogic
-    source Dir.getwd + '/' + RAMBAFILE_NAME
-    suppress_errors(true)
-  end
-end