rails-new 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4796dc67275bd498094319869adcf14864198733
-  data.tar.gz: 3cbdcf5b99f8be252ae5699c90e8df4d23302107
+  metadata.gz: 2574d8e6e14dafba2a540d34dcea2ae52e6f7614
+  data.tar.gz: 915ba3662d5a33c03121bcf74b1a0be4103c3c80
 SHA512:
-  metadata.gz: 06e7ac0ab0068a4c92b32ad51c19f94f21130066bb4202af19573213f16786886ca54901d95601c7ff51a6169e37f9c0cf18d90486c11f9291acb7867e173831
-  data.tar.gz: 05a97a083d462f38d886b2f5ebcaa9f07a2411a08d940209b177c2b6b2cba06a67a6e29a74343407887142b0fd8cec8f4e338709227a6598184c70eac7f363b5
+  metadata.gz: 626a7cb24ebb747869b6fc4a68726da8e0f013cc834872629b04ad4e5c6ffe8f2e56aef9f4da0a681657a8af3c307ad953be2a7c00d8d389f36c1d89fb172999
+  data.tar.gz: 30319c83146979c7ec93e8a27df8302ed1a77c41ac8534b6c35e232e23cfe9e63449b7069a51018eb64f86bcc62d902c02362b0630d814395ac2aae274ae3538

data/bin/rails-new

@@ -1,85 +1,10 @@
 #!/usr/bin/env ruby
-
-require "thor"
-require "thor/group"
-require 'httparty'
-require 'tmpdir'
-
 require_relative '../lib/rails_new'
 
-class RailsNewWrapper < Thor::Group
-  desc "run `rails new` with the requirements of the template"
-
-  argument :template_key,
-    :type => :string,
-    :desc => "The template key in the format user/template",
-    :required => true
-
-  argument :app_name,
-    :type => :string,
-    :desc => "The application name to pass to Rails",
-    :required => true
-
-  def request_template_data
-    url = RailsNew::Api.template_url_for(template_key)
-
-    say "Fetching template data from ", :green, false
-    say url, :blue
-
-    @response = HTTParty.get(url)
-    if @response.code != 200
-      raise "The response of the server to #{@response.request.uri} was not 200."
-    end
-  end
-
-  def parse_template_data
-    @template_data = JSON.parse(@response.body)['template']
-    @git_repository = @template_data['git_repository']
-    @git_branch = @template_data['git_branch']
-    @main_file_location = @template_data["main_file_location"]
-    @arguments = build_arguments_array(@template_data['arguments'])
-  end
-
-  def run_template
-    Dir.mktmpdir do |temp_dir|
-      template_location = Pathname.new(temp_dir).join(@main_file_location).to_s
-
-      say "Cloning git repository ", :green, false
-      say @git_repository, :blue
-      Kernel.system %w{git clone -b #{@git_branch} #{@git_repository} #{temp_dir}}
-
-      command = [
-        "rails", "new", @app_name, "-m", template_location, *@arguments, *extra_rails_arguments
-      ]
-      
-      say "The following command will be executed:", :green, false
-
-      puts "\n\n"
-      say command.join(' '), :blue
-      puts
-
-      if yes? "Is this command safe?"
-        say "Executing template", :green
-        Kernel.system *command
-      else
-        say "Aborted command. Please review the template #{template_key}.", :red
-      end
-    end
-  end
-
-  private
-
-  def build_arguments_array(arguments)
-    arguments.map do |arg|
-      tokens = [arg['key']]
-      tokens << [arg['value']] if arg['has_value']
-      tokens
-    end.flatten
-  end
-
-  def extra_rails_arguments
-    @extra_rails_arguments ||= ARGV[2..-1]
-  end
+if ['-v', '--version'].include?(ARGV.first)
+  require_relative '../lib/rails_new/version'
+  puts RailsNew::VERSION
+  exit(0)
 end
 
-RailsNewWrapper.start(ARGV)
+RailsNew::CLI.start(ARGV)

data/lib/rails_new.rb

@@ -2,3 +2,5 @@ module RailsNew
 end
 
 require_relative './rails_new/api'
+require_relative './rails_new/command'
+require_relative './rails_new/cli'

data/lib/rails_new/cli.rb

@@ -0,0 +1,89 @@
+require "thor"
+require "thor/group"
+require "httparty"
+require "tmpdir"
+
+module RailsNew
+  class CLI < Thor::Group
+    desc "run `rails new` with the requirements of the template"
+
+    argument :template_key,
+      :type => :string,
+      :desc => "The template key in the format user/template",
+      :required => true
+
+    argument :app_name,
+      :type => :string,
+      :desc => "The application name to pass to Rails",
+      :required => true
+
+    class_option :version, :type => :string, :required => false
+
+    def request_template_data
+      url = RailsNew::Api.template_url_for(template_key)
+
+      say "Fetching template data from ", :green, false
+      say url, :blue
+
+      @response = HTTParty.get(url)
+      if @response.code != 200
+        raise "The response of the server to #{@response.request.uri} was not 200."
+      end
+    end
+
+    def parse_template_data
+      @template_data = JSON.parse(@response.body)['template']
+      @git_repository = @template_data['git_repository']
+      @git_branch = @template_data['git_branch']
+      @main_file_location = @template_data["main_file_location"]
+      @arguments = build_arguments_array(@template_data['arguments'])
+    end
+
+    def run_template
+      Dir.mktmpdir do |temp_dir|
+        template_location = Pathname.new(temp_dir).join(@main_file_location).to_s
+
+        say "Cloning git repository ", :green, false
+        say @git_repository, :blue
+        clone_command = RailsNew::Command.new("git", "clone", "-b", @git_branch, @git_repository, temp_dir)
+        clone_command.run
+
+        rails_command = RailsNew::Command.new(
+          "rails", "new", @app_name, "-m", template_location, *@arguments, *extra_rails_arguments
+        )
+        
+        say "The following command will be executed:", :green, false
+
+        puts "\n\n"
+        say rails_command.to_s, :blue
+        puts
+
+        if yes? "Is this command safe?"
+          say "Executing template", :green
+          rails_command.run
+        else
+          say "Aborted command. Please review the template #{template_key}.", :red
+          exit(1)
+        end
+      end
+    end
+
+    def exit_on_failure?
+      true
+    end
+
+    private
+
+    def build_arguments_array(arguments)
+      arguments.map do |arg|
+        tokens = [arg['key']]
+        tokens << [arg['value']] if arg['has_value']
+        tokens
+      end.flatten
+    end
+
+    def extra_rails_arguments
+      @extra_rails_arguments ||= ARGV[2..-1]
+    end
+  end
+end

data/lib/rails_new/command.rb

@@ -0,0 +1,24 @@
+module RailsNew
+  class Command
+    attr_reader :command
+
+    def initialize(*command)
+      self.command = command
+    end
+
+    def run
+      result = Kernel.system *command
+      unless result
+        raise "Command #{to_s} failed."
+      end
+    end
+
+    def to_s
+      command.join(' ')
+    end
+
+    private
+
+    attr_writer :command
+  end
+end

data/lib/rails_new/version.rb

@@ -1,3 +1,3 @@
 module RailsNew
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-new
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - juliogarciag
@@ -83,6 +83,8 @@ files:
 - lib/rails_new.rb
 - lib/rails_new/.DS_Store
 - lib/rails_new/api.rb
+- lib/rails_new/cli.rb
+- lib/rails_new/command.rb
 - lib/rails_new/version.rb
 - rails-new.gemspec
 homepage: ''