generamba 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffb2a6a54f2534abe4a3a94904ac75c4dfc375cf
-  data.tar.gz: beef4c78efff15575167171b8ac21293ee34d092
+  metadata.gz: 49edac40853a1e75968a2583d0e2ee41dd17ce10
+  data.tar.gz: b58c8ab9bdc965aa61e094403a1ea5a7d64183f7
 SHA512:
-  metadata.gz: bb416b0ca779e1bc359734e2082a4f4b91e2e078b85ff93ae8d6313f074ca1720a716020f490efa264c83c8439161f63f2fd2f357856d0b4d0424ce10d6b0d1f
-  data.tar.gz: 9147cf3e069cb1d99d3984979943d45d725c80d74fb6831be704b949e904c20b196d17a25ce340f8ca491c2f8b2bd6137e6d0435298efa2e721e9b0cf0db6bee
+  metadata.gz: b5d0ed0bbb05aa123c9176370c20aedf4445003736742f3b93c8d5f16d5947523682ab9f9752f15569dcccfd70fba9f00d86ea6800c3a13050fab10de9a25f70
+  data.tar.gz: b196bf8123c9b4649a41efed5d9de8764d71b4da9e6998a0f6a1d052998a70334c464a63a8c267c5e068fa982fb9182f3ed5349ad664f3f4d82efc372f9f91a6

data/generamba.gemspec

@@ -18,14 +18,16 @@ Gem::Specification.new do |spec|
   spec.executables   = ['generamba']
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'thor'
-  spec.add_dependency 'xcodeproj'
-  spec.add_dependency 'liquid'
-  spec.add_dependency 'tilt'
-  spec.add_dependency 'settingslogic'
-  spec.add_dependency 'git'
+  spec.required_ruby_version = '>= 2.2'
+
+  spec.add_runtime_dependency 'thor', '0.19.1'
+  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'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '~> 3.4'
 end

data/lib/generamba/cli/cli.rb

@@ -5,6 +5,7 @@ require 'tilt'
 require 'git'
 require 'generamba/cli/gen_command.rb'
 require 'generamba/cli/setup_command.rb'
+require 'generamba/cli/setup_username_command.rb'
 require 'generamba/cli/thor_extension.rb'
 require 'generamba/cli/template/template_group.rb'
 

data/lib/generamba/cli/gen_command.rb

@@ -1,8 +1,11 @@
 require 'thor'
+require 'generamba/helpers/rambafile_validator.rb'
 
 module Generamba::CLI
   class Application < Thor
 
+    include Generamba
+
     desc 'gen [MODULE_NAME] [TEMPLATE_NAME_KEY]', 'Creates a new VIPER module with a given name from a specific template'
     method_option :description, :aliases => '-d', :desc => 'Provides a full description to the module'
     def gen(module_name, template_name)
@@ -14,6 +17,12 @@ module Generamba::CLI
         return
       end
 
+      rambafile_validator = Generamba::RambafileValidator.new
+      rambafile_validator.validate(RAMBAFILE_NAME)
+
+      setup_username_command = Generamba::CLI::SetupUsernameCommand.new
+      setup_username_command.setup_username
+
       default_module_description = "#{module_name} module"
       module_description = options[:description] ? options[:description] : default_module_description
 

data/lib/generamba/cli/setup_command.rb

@@ -13,20 +13,14 @@ module Generamba::CLI
     def setup
       properties = {}
 
-      git_username = Git.init.config['user.name']
-
-      if git_username != nil && yes?("Your name in git is configured as #{git_username}. Do you want to use it in code headers? (yes/no)")
-        username = git_username
-      else
-        username = ask_non_empty_string('The author name which will be used in the headers:', 'User name should not be empty')
-      end
-
-      Generamba::UserPreferences.save_username(username)
+      setup_username_command = Generamba::CLI::SetupUsernameCommand.new
+      setup_username_command.setup_username
 
       properties[COMPANY_KEY] = ask('The company name which will be used in the headers:')
 
       project_name = Pathname.new(Dir.getwd).basename.to_s
       is_right_project_name = yes?("The name of your project is #{project_name}. Do you want to use it? (yes/no)")
+
       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):')
 
@@ -44,7 +38,6 @@ module Generamba::CLI
 
       targets_prompt = ''
       project.targets.each_with_index { |element, i| targets_prompt += ("#{i}. #{element.name}" + "\n") }
-
       project_target = ask_index("Select the appropriate target for adding your MODULES (type the index):\n" + targets_prompt,project.targets)
       test_target = ask_index("Select the appropriate target for adding your TESTS (type the index):\n" + targets_prompt,project.targets)
 

data/lib/generamba/cli/setup_username_command.rb

@@ -0,0 +1,21 @@
+module Generamba::CLI
+  class SetupUsernameCommand < Thor
+
+    no_commands {
+      def setup_username
+        username = Generamba::UserPreferences.obtain_username
+        if username == nil
+          puts('The author name is not configured!')
+          git_username = Git.init.config['user.name']
+          if git_username != nil && yes?("Your name in git is configured as #{git_username}. Do you want to use it in code headers? (yes/no)")
+            username = git_username
+          else
+            username = ask_non_empty_string('The author name which will be used in the headers:', 'User name should not be empty')
+          end
+          Generamba::UserPreferences.save_username(username)
+        end
+
+      end
+    }
+  end
+end

data/lib/generamba/cli/thor_extension.rb

@@ -25,7 +25,7 @@ module Generamba::CLI
       def ask_with_validation(message, is_valid_value, description = 'Invalid value')
         loop do
           value = ask(message)
-          break if is_valid_value.call(value)
+          return value if is_valid_value.call(value)
           puts(description)
         end
       end

data/lib/generamba/helpers/rambafile_validator.rb

@@ -0,0 +1,38 @@
+module Generamba
+
+  # Provides methods for validating Rambafile contents
+  class RambafileValidator
+
+    # Method validates Rambafile contents
+    # @param path [String] The path to a Rambafile
+    def validate(path)
+      file_contents = open(path).read
+      preferences = file_contents.empty? ? {} : YAML.load(file_contents).to_hash
+
+      mandatory_fields = [COMPANY_KEY,
+                          PROJECT_NAME_KEY,
+                          XCODEPROJ_PATH_KEY,
+                          PROJECT_TARGET_KEY,
+                          PROJECT_FILE_PATH_KEY,
+                          PROJECT_GROUP_PATH_KEY,
+                          TEST_TARGET_KEY,
+                          TEST_FILE_PATH_KEY,
+                          TEST_GROUP_PATH_KEY,
+                          TEMPLATES_KEY]
+
+      mandatory_fields.each { |field|
+        if preferences.has_key?(field) == false
+          error_description = "Rambafile is broken! Cannot find #{field} field, which is mandatory. Either add it manually, or run *generamba setup*."
+          raise StandardError.new(error_description)
+        end
+      }
+
+      if preferences[TEMPLATES_KEY] == nil
+        error_description = "You can't run *generamba gen* without any templates installed. Add their declarations to a Rambafile and run *generamba template install*."
+        raise StandardError.new(error_description)
+      end
+
+    end
+
+  end
+end

data/lib/generamba/version.rb

@@ -1,3 +1,3 @@
 module Generamba
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generamba
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Egor Tolstoy
@@ -9,92 +9,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-15 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.28.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.9.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -127,16 +127,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.4'
 description: Generamba is a powerful and easy-to-use Xcode code generator. It provides
   a project-based configuration, flexible templates system, the ability to generate
   code and tests simultaneously.
@@ -153,7 +153,6 @@ files:
 - LICENSE.txt
 - Rakefile
 - Readme.md
-- bin/GenerambaSandbox/Rambafile
 - bin/console
 - bin/generamba
 - bin/setup
@@ -162,6 +161,7 @@ files:
 - lib/generamba/cli/cli.rb
 - lib/generamba/cli/gen_command.rb
 - lib/generamba/cli/setup_command.rb
+- lib/generamba/cli/setup_username_command.rb
 - lib/generamba/cli/template/template_create_command.rb
 - lib/generamba/cli/template/template_group.rb
 - lib/generamba/cli/template/template_install_command.rb
@@ -177,6 +177,7 @@ files:
 - lib/generamba/constants/rambafile_constants.rb
 - lib/generamba/constants/rambaspec_constants.rb
 - lib/generamba/constants/user_preferences_constants.rb
+- lib/generamba/helpers/rambafile_validator.rb
 - lib/generamba/helpers/template_helper.rb
 - lib/generamba/helpers/xcodeproj_helper.rb
 - lib/generamba/module_generator.rb
@@ -205,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/bin/GenerambaSandbox/Rambafile

@@ -1,17 +0,0 @@
----
-author: Egor Tolstoy
-company: Rambler&Co
-project_name: GenerambaSandbox
-prefix: 
-xcodeproj_path: "/Users/etolstoy/Generamba/GenerambaSandbox/GenerambaSandbox.xcodeproj"
-project_target: GenerambaSandbox
-project_file_path: GenerambaSandbox/Classes/Modules/
-project_group_path: GenerambaSandbox/Classes/Modules/
-test_target: GenerambaSandboxTests
-test_file_path: GenerambaSandboxTests/Classes/Modules/
-test_group_path: GenerambaSandboxTests/Classes/Modules/
-templates:
-- {name: default_template, git: 'https://github.com/igrekde/default_template.git'}
-- {name: rambler_viper_controller, local: '/Users/etolstoy/Generamba/rambler_viper_controller'}
-- {name: rambler_viper_controller2, local: '/Users/etolstoy/Generamba/rambler_viper_controller2'}
-- {name: default}