toxic 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c56348e42d597019f3576c5ee3329f12cca67e5ac6af4a46f5a35b8f7b567d
-  data.tar.gz: 598ed0ab773ba5320ed28b05c7258150e4272c09ed6dc105f9d25492669f062d
+  metadata.gz: 73b4b9e5f5e2fa21357aa55a9818585c6e90fe531d4b71835894a1fb9ffe177f
+  data.tar.gz: 69ebc1c3382ae9ec65255de322bc462ac5d90e892e570c6e9c7726c07be81bc3
 SHA512:
-  metadata.gz: 31fbe3e77b6398e32689c06b69bc54b02b7c8fdd9d95808e7c75c06cac682c0851a5d678e9ac203dcdb5d3f4fb932616d2694e58f7ac7fe15190a693e846a8b4
-  data.tar.gz: c665b7f5012f7e37edeb5ea67d218b40c3ea3e229a0fdaa5b0bab066cf1b1f2692d8e03b76ff63d77d9597d19d7c61b62a82f07d5aa170cf5633d100b972995b
+  metadata.gz: 8adc97ca1e9751d74c8b5ceb9ef1ee9e8d5e45b2144379df3e5d8cfcaa29a7d74c534d65bba419cbedae001a0873fb232f62285a6d16f141366f15cf627b452c
+  data.tar.gz: b23a6319ddc0365952982470769cc0c73112b62abad097f3999d9328bb508aca4e4a7c7c9471d5c2d4c2dc528380221828d7e9ff9dd14f4b48e6c83f5f0048c5

data/README.md

@@ -4,21 +4,8 @@
 create xcode project from template
 
 ## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem Toxic
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
     $ gem install Toxic
-
+    
 ## Usage
 
 using default template
@@ -30,21 +17,6 @@ using your own template
     $ toxic project create <name> --template-url=<repository address>
     
 
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/Toxic. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the Toxic project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/Toxic/blob/master/CODE_OF_CONDUCT.md).

data/lib/toxic/command/project.rb

@@ -4,7 +4,7 @@ desc 'Project'
 command :project, :p do |c|
   c.desc 'template url'
   c.arg_name 'template-url'
-  c.default_value 'https://github.com/srv7/project-template.git'
+  c.default_value 'https://github.com/srv7/ios-template-project.git'
   c.flag :'template-url'
 
   c.desc 'create xcode project'

data/lib/toxic/source/project.rb

@@ -8,6 +8,7 @@ module Toxic
 
       attr_accessor :name, :template_url, :author, :organization, :repository_address
       attr_accessor :template_name, :template_author, :template_organization
+      attr_accessor :template_name_other
 
       def initialize(name, template_url)
         @name = name
@@ -23,13 +24,16 @@ module Toxic
         configure_template
         set_bundle_identifiers
         add_git_repository
+        pod_install
+        add_fastlane
+        open_project
       end
 
       def validate!
         raise "A name for the project is required." unless name
         raise "The project name cannot contain spaces." if name =~ /\s/
         raise "The project name cannot begin with a '.'" if name[0, 1] == '.'
-        puts CLI::UI.fmt("{{green: validate! pass")
+        raise "" if name =~ /[^a-zA-Z0-9]/
       end
 
       def clone_template
@@ -44,15 +48,13 @@ module Toxic
           end
         end
         system "git clone #{@template_url} #{name}"
-
-        puts CLI::UI.fmt("{{green: clone_template pass")
       end
 
       def get_template_info
         template_path = Dir.glob("./#{name}/**/**/*.xcodeproj").first
         @template_name = File.basename(template_path, '.xcodeproj')
+        @template_name_other = template_name.gsub(/[^a-zA-Z0-9]/, '_')
         @template_author, @template_organization = template_author_organization
-        puts CLI::UI.fmt("{{green: get_template_info pass")
       end
 
       def ask_info_for_new
@@ -60,9 +62,6 @@ module Toxic
 
         @author = CLI::UI.ask('author for the project:')
         @organization = CLI::UI.ask('organization for the project:')
-        @repository_address = CLI::UI.ask('repository address for the project:')
-
-        puts CLI::UI.fmt("{{green: ask_info_for_new pass")
       end
 
       def remove_useless
@@ -70,17 +69,14 @@ module Toxic
         system "rm -rf ./#{name}/**/xcuserdata/"
         system "rm -rf ./#{name}/**/**/xcuserdata/"
         system "rm -rf ./#{name}/**/**/xcshareddata"
-        puts CLI::UI.fmt("{{green: remove_useless pass")
       end
 
       def configure_template
         traverse_dir(Pathname("./#{name}"))
-        puts CLI::UI.fmt("{{green: configure_template pass")
       end
 
       def set_bundle_identifiers
         puts CLI::UI.fmt("{{cyan: Let's setup your bundle identifiers}}")
-
         project_path = Dir.glob("./#{name}/**/**/#{name}.xcodeproj").first
         project = Xcodeproj::Project.open(project_path)
         project.targets.each do |target|
@@ -96,18 +92,45 @@ module Toxic
 
       def add_git_repository
         Dir.chdir("#{name}") do |_|
-          puts CLI::UI.fmt("{{green: initializing git}}")
-          system "git init"
+          system "git init > /dev/null"
+          puts CLI::UI.fmt("{{green: Initialized empty Git repository}}")
+          @repository_address = CLI::UI.ask('repository address for the project:(enter to skip)')
           system "git remote add origin #{repository_address}" unless repository_address.empty?
-          project = Dir.glob("./#{name}/**/**/#{name}.xcworkspace").first
-          project = Dir.glob("./#{name}/**/**/#{name}.xcodeproj") unless Dir.glob(project).any?
-          system "open #{project}"
         end
       end
 
+      def pod_install
+        Dir.chdir("#{name}") do |_|
+          if File.exists?('Podfile')
+            decision = CLI::UI.ask("Podfile detected, do you want to exec 'pod install' ?", options: %w(install later))
+            case decision
+            when 'install'
+              system "pod install"
+            else break
+            end
+          end
+        end
+      end
+
+      def add_fastlane
+        return nil unless system "which fastlane > /dev/null"
+        decision = CLI::UI.ask("do you want to add fastlane to your project? (y/n)", default: 'y')
+        return nil unless decision == 'y'
+        Dir.chdir("#{name}") do |_|
+          system "fastlane init"
+        end
+      end
+
+      def open_project
+        project = Dir.glob("./**/**/#{name}.xcworkspace").first
+        project = Dir.glob("./**/**/#{name}.xcodeproj") unless Dir.glob(project).any?
+        system "open #{project}"
+      end
+
       def traverse_dir(file_path)
+        puts "updating #{file_path}"
+        file_path = rename(file_path)
         if File.directory?(file_path)
-          file_path = rename(file_path)
           Dir.each_child(file_path) do |file|
             traverse_dir(file_path + file)
           end
@@ -144,13 +167,12 @@ module Toxic
 
       def rename(original_name)
         name_new = original_name.sub(Regexp.new(Regexp.escape(template_name), Regexp::IGNORECASE), name)
+        name_new = name_new.sub(Regexp.new(Regexp.escape(template_name_other), Regexp::IGNORECASE), name)
         File.rename(original_name, name_new)
         name_new
       end
 
       def update_content(file_path)
-        puts "updating #{file_path}"
-
         begin
 
           file = File.new("#{file_path}_new", "w+")
@@ -159,6 +181,7 @@ module Toxic
             line = "//  Created by #{author} on #{Date.today}." if /^\/\/ {2}Created by/ =~ line
             line = "//  Copyright © 2018 #{organization}. All rights reserved." if /^\/\/ {2}Copyright ©/ =~ line
             line.gsub!(Regexp.new(Regexp.escape(template_name), Regexp::IGNORECASE), name)
+            line.gsub!(Regexp.new(Regexp.escape(template_name_other), Regexp::IGNORECASE), name)
             line.gsub!(Regexp.new(Regexp.escape(template_organization), Regexp::IGNORECASE), organization)
             line.gsub!(Regexp.new(Regexp.escape(template_author), Regexp::IGNORECASE), author)
             file.puts line
@@ -167,11 +190,9 @@ module Toxic
           file.close
           File.delete(origin)
           File.rename("#{file_path}_new", file_path)
-
         rescue Exception
-# ignored
+          # ignored
         end
-        rename(file_path)
       end
     end
   end

data/lib/toxic/version.rb

@@ -1,3 +1,3 @@
 module Toxic
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toxic
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - liubo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler