learn_duplicate 0.0.15 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cfdd59991a706b75c64d8de8e3cee1fc0e1ad16ee5dfb979fd5cb3da6464dd5
-  data.tar.gz: 146a1bb4d4dff291886cb16d95c2766a3ed3dafe38a111ee2a0bbbc003561b17
+  metadata.gz: de4ad83a7cc673eb3aace9f6377a25447ab2c6fe92bdda14e59eb3a7d252ba4c
+  data.tar.gz: 73615dd4f8d998c355210867a347f58ba15093591b354172111329df7b8cab66
 SHA512:
-  metadata.gz: e5d4fc1256d1807abb555ecf4e7bb0aeb2f4c88d9448131bec80bf7f41ad06eded366dc94d2380dc5f5d0324557445a0b55aafc7bc4a7255c8877f78df4ca90c
-  data.tar.gz: 29f2ed91e97f14997d816322a96a81b657117ecd23aa6cb79890bfa893b49fe31d1de1aa9c8bb7867a2d1f6e7b3bc8178ea40043424b03408057fc37d83392ad
+  metadata.gz: 1111b280c4623e3f2fa16f5b7d7cad8401aa9ee90b1ed4cf5843ea52e1bd5dd95e321df45b4b693fbcc634098d3066403102aad55335b550d06a627cf9c5dd5f
+  data.tar.gz: 4f7bbabe358898532586e8a531af80ef44777618cf50496dc32c2407c419c1f95845d2d328dd141c6191fcdb2ea1cd2199f9d3489e00268307a395fadf94a0f8

data/bin/learn_duplicate

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'optparse'
 require 'learn_duplicate'
@@ -52,43 +53,59 @@ OptionParser.new do |opts|
 
   EOBANNER
 
-  opts.on("--script", "Run in non-interactive mode") { |v| options[:ni] = true }
-  opts.on("-v", "--verbose", "Run in verbose mode"){ |v| options[:verbose] = true }
-  opts.on("--trimprefix[=OPTIONAL]", "Prefix to remove from <source>; implies --script") { |t| options[:trimprefix] = t }
-  opts.on("--newprefix[=OPTIONAL]", "Prefix to prepent to new destination repo name; implies --script")  { |n| options[:newprefix] = n }
-  opts.on("--dry-run", "Do not actually make calls, print info out"){ options[:dryrun] = true }
+  opts.on('-s', '--script', 'Run in non-interactive mode') { |_v| options[:ni] = true }
+  opts.on('-v', '--verbose', 'Run in verbose mode') { |_v| options[:verbose] = true }
+  opts.on('--trimprefix OLD_PREFIX', 'Prefix to remove from <source>; implies --script') do |t|
+    options[:trimprefix] = t
+  end
+  opts.on('--newprefix NEW_PREFIX', 'Prefix to prepent to new destination repo name; implies --script') do |n|
+    options[:newprefix] = n
+  end
+  opts.on('--rename NEW_BASE', 'Prefix to rename repository; changes text after prefix; implies --script') do |r|
+    options[:rename] = r
+  end
+  opts.on('-d', '--dry-run', 'Do not actually make calls, print info out') { options[:dryrun] = true }
 end.parse!
 
 # Prefixes imply non-interactivity
-options[:ni] = !!(options[:trimprefix] || options[:newprefix])
+options[:ni] = !!(options[:trimprefix] || options[:newprefix] || options[:rename])
 
 REPO_SOURCE = ARGV[0]
 VERBOSE_FLAG = options[:verbose]
 
 if options[:ni]
-  source_name = REPO_SOURCE.split('/').last.sub(/^(.*).*$/, "\\1")
-  if source_name.index(options[:trimprefix]) == 0
-    puts "Trim prefix is valid " if VERBOSE_FLAG
+  source_name = REPO_SOURCE.split('/').last.sub(/^(.*).*$/, '\\1')
+
+  if options[:trimprefix] && !options[:rename]
+    if source_name.index(options[:trimprefix]) == 0
+      puts 'Trim prefix is valid ' if VERBOSE_FLAG
+    else
+      raise ArgumentError, 'The --trimprefix is not left-anchored on the <source>'
+    end
+
+    if options[:trimprefix] && !options[:newprefix]
+      raise ArgumentError, 'If you have trimprefix you want newprefix as well'
+    end
+
+    trimmed_base = source_name.slice(options[:trimprefix].length..source_name.length)
+  elsif options[:rename]
+    puts 'Renaming base to ' + options[:rename] if VERBOSE_FLAG
+    trimmed_base = options[:rename]
   else
-    raise ArgumentError, "The --trimprefix is not left-anchored on the <source>"
+    puts 'Repository name will be the same as the original repo unless a new prefix is included' if VERBOSE_FLAG
+    trimmed_base = source_name
   end
 
-  unless (options[:trimprefix] && options[:newprefix])
-    raise ArgumentError, "If you have trimprefix you want newprefix as well"
-  end
-
-  trimmed_base = source_name.slice(options[:trimprefix].length..source_name.length)
   destination = String(options[:newprefix]) + trimmed_base
 
   puts "Trimmed base: #{trimmed_base}" if VERBOSE_FLAG
   puts "Destination: #{destination}" if VERBOSE_FLAG
 
-  LearnDuplicate.new(options.merge({
-    source_name: source_name,
-    base: trimmed_base.downcase,
-    destination: destination.downcase
-  }))
+  LearnDuplicate.new(options.merge(
+                       source_name: source_name,
+                       base: trimmed_base.downcase,
+                       destination: destination.downcase
+                     ))
 else
   LearnDuplicate.new
 end
-

data/lib/learn_duplicate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'faraday'
 require 'uri'
 require 'open3'
@@ -5,21 +7,23 @@ require 'open3'
 class LearnDuplicate
   GITHUB_ORG = 'https://api.github.com/repos/learn-co-curriculum/'
 
-  def initialize(opts={})
+  def initialize(opts = {})
     # For non-interactive mode
+    
     if opts[:ni]
-      validate_repo = ->(repo_name) do
+      validate_repo = lambda do |repo_name|
         url = GITHUB_ORG + repo_name
         encoded_url = URI.encode(url).slice(0, url.length)
         check_existing = Faraday.get URI.parse(encoded_url)
         if check_existing.body.include? '"Not Found"'
           raise IOError, "Could not connect to #{url}"
         end
+
         repo_name
       end
 
-      de_apiify_url = ->(api_url) do
-        api_url.gsub(/(api\.|repos\/)/, '')
+      de_apiify_url = lambda do |api_url|
+        api_url.gsub(%r{(api\.|repos/)}, '')
       end
 
       @old_repo = validate_repo.call(opts[:source_name])
@@ -30,76 +34,75 @@ class LearnDuplicate
 
       @repo_name = opts[:destination]
 
-      if (!opts[:dryrun])
+      if !opts[:dryrun]
         begin
           create_new_repo
           puts ''
           puts 'To access local folder, change directory into ' + @repo_name + '/'
           puts "Repository available at #{de_apiify_url.call(GITHUB_ORG + @repo_name)}"
-        rescue => e
-          STDERR.puts(e.message)
+        rescue StandardError => e
+          warn(e.message)
         end
       else
         puts "DRY RUN: Would execute copy of: #{de_apiify_url.call(@old_repo)} to #{@repo_name}"
       end
 
       exit
-    end
-
-    @repo_name = ''
-    @old_repo = ''
 
-    puts 'Note: You must have write access to the learn-co-curriculum org on GitHub to use this tool'
-
-    loop do
-      puts 'What is the name of the repository you would like to copy? Paste exactly as is shown in the URL (i.e. advanced-hashes-hashketball)'
-      @old_repo = gets.strip
-
-      url = GITHUB_ORG + @old_repo
-      encoded_url = URI.encode(url).slice(0, url.length)
-      check_existing = Faraday.get URI.parse(encoded_url)
+    else
+      @repo_name = ''
+      @old_repo = ''
 
-      # careful - will hit rate limit on GitHub if abused
-      if check_existing.body.include? '"Not Found"'
-        puts 'Provided repository name is not a valid learn-co-curriculum repository. Please try again.'
-      else
-        break
-      end
-    end
+      puts 'Note: You must have write access to the learn-co-curriculum org on GitHub to use this tool'
 
-    loop do
-      puts ''
-      puts 'Old repository: ' + @old_repo
-      puts 'What is the name of the repository you would like to create?'
+      loop do
+        puts 'What is the name of the repository you would like to copy? Paste exactly as is shown in the URL (i.e. advanced-hashes-hashketball)'
+        @old_repo = gets.strip
 
-      @repo_name = gets.strip.gsub(/\s+/, '-').downcase
-      if @repo_name.length >= 100
-        puts 'Repository names must be shorter than 100 characters'
-      else
-        url = GITHUB_ORG + @repo_name
+        url = GITHUB_ORG + @old_repo
         encoded_url = URI.encode(url).slice(0, url.length)
         check_existing = Faraday.get URI.parse(encoded_url)
 
-
+        # careful - will hit rate limit on GitHub if abused
         if check_existing.body.include? '"Not Found"'
+          puts 'Provided repository name is not a valid learn-co-curriculum repository. Please try again.'
+        else
           break
+        end
+      end
+
+      loop do
+        puts ''
+        puts 'Old repository: ' + @old_repo
+        puts 'What is the name of the repository you would like to create?'
+
+        @repo_name = gets.strip.gsub(/\s+/, '-').downcase
+        if @repo_name.length >= 100
+          puts 'Repository names must be shorter than 100 characters'
         else
-          puts 'A repository with that name already exists or you may have hit a rate limit'
-          puts GITHUB_ORG + @repo_name
-          puts ''
+          url = GITHUB_ORG + @repo_name
+          encoded_url = URI.encode(url).slice(0, url.length)
+          check_existing = Faraday.get URI.parse(encoded_url)
+
+          if check_existing.body.include? '"Not Found"'
+            break
+          else
+            puts 'A repository with that name already exists or you may have hit a rate limit'
+            puts GITHUB_ORG + @repo_name
+            puts ''
+          end
         end
       end
-    end
 
-    create_new_repo
-    puts ''
-    puts 'To access local folder, change directory into ' + @repo_name + '/'
-    puts "Repository available at #{GITHUB_ORG}" + @repo_name
+      create_new_repo
+      puts ''
+      puts 'To access local folder, change directory into ' + @repo_name + '/'
+      puts "Repository available at #{GITHUB_ORG}" + @repo_name
+    end
   end
 
   private
 
-
   def create_local_lesson(type = 'readme', language = nil)
     if !language
       puts "Creating #{type}..."
@@ -114,10 +117,9 @@ class LearnDuplicate
 
     copy_template(template_path)
     create_dot_learn_file(type, language)
-    create_dot_gitignore_file()
+    create_dot_gitignore_file
   end
 
-
   def cd_into_and(command)
     "cd #{@repo_name} && #{command}"
   end
@@ -129,7 +131,7 @@ class LearnDuplicate
 
   def rename_repo
     cmd = "mv -f #{@old_repo} #{@repo_name}"
-    cd_into_and("git remote rename origin origin-old")
+    cd_into_and('git remote rename origin origin-old')
     `#{cmd}`
   end
 
@@ -149,8 +151,8 @@ class LearnDuplicate
     # Copy `master`, attempt to copy `solution`, but if it's not there, no
     # complaints
     cmds = [
-      %q|git push origin 'refs/remotes/origin/master:refs/heads/master' > /dev/null 2>&1|,
-      %q|git push origin 'refs/remotes/origin/solution:refs/heads/solution' > /dev/null 2>&1|
+      "git push origin 'refs/remotes/origin/master:refs/heads/master' > /dev/null 2>&1",
+      "git push origin 'refs/remotes/origin/solution:refs/heads/solution' > /dev/null 2>&1"
     ]
     cmds.each { |cmd| `#{cd_into_and(cmd)}` }
   end
@@ -160,10 +162,17 @@ class LearnDuplicate
     result.include?("You've successfully authenticated")
   end
 
+  def git_pull
+    cmd = "cd #{@old_repo} && git fetch --all && git pull --all"
+    `#{cmd}`
+  end
+
   def create_new_repo
     # 'cd' doesn't work the way it would in the shell, must be used before every command
     puts 'Cloning old repository'
     git_clone
+    puts 'Getting Branches'
+    git_pull
     puts "Renaming old directory with new name: #{@repo_name}"
     rename_repo
     puts ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn_duplicate
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.20
 platform: ruby
 authors:
 - flatironschool
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,39 +38,6 @@ files:
 - Rakefile
 - bin/learn_duplicate
 - lib/learn_duplicate.rb
-- lib/templates/javascript_lab_template/CONTRIBUTING.md
-- lib/templates/javascript_lab_template/LICENSE.md
-- lib/templates/javascript_lab_template/README.md
-- lib/templates/javascript_lab_template/index.html
-- lib/templates/javascript_lab_template/index.js
-- lib/templates/javascript_lab_template/package-lock.json
-- lib/templates/javascript_lab_template/package.json
-- lib/templates/javascript_lab_template/test/helpers.js
-- lib/templates/javascript_lab_template/test/indexTest.js
-- lib/templates/react-lab-template/README.md
-- lib/templates/react-lab-template/package-lock.json
-- lib/templates/react-lab-template/package.json
-- lib/templates/react-lab-template/public/index.html
-- lib/templates/react-lab-template/public/manifest.json
-- lib/templates/react-lab-template/src/App.css
-- lib/templates/react-lab-template/src/App.js
-- lib/templates/react-lab-template/src/components/Button.js
-- lib/templates/react-lab-template/src/components/ExampleComponent.js
-- lib/templates/react-lab-template/src/components/Greeting.js
-- lib/templates/react-lab-template/src/index.js
-- lib/templates/react-lab-template/test/index.test.js
-- lib/templates/react-lab-template/test/mocha.opts
-- lib/templates/readme_template/CONTRIBUTING.md
-- lib/templates/readme_template/LICENSE.md
-- lib/templates/readme_template/README.md
-- lib/templates/ruby_lab_template/CONTRIBUTING.md
-- lib/templates/ruby_lab_template/Gemfile
-- lib/templates/ruby_lab_template/Gemfile.lock
-- lib/templates/ruby_lab_template/LICENSE.md
-- lib/templates/ruby_lab_template/README.md
-- lib/templates/ruby_lab_template/lib/example.rb
-- lib/templates/ruby_lab_template/spec/example_spec.rb
-- lib/templates/ruby_lab_template/spec/spec_helper.rb
 homepage: https://github.com/learn-co-curriculum/learn_duplicate
 licenses:
 - MIT
@@ -90,8 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: learn_duplicate is a tool for duplicating learn.co lessons on github

data/lib/templates/javascript_lab_template/CONTRIBUTING.md

@@ -1,40 +0,0 @@
-# Contributing to Learn.co Curriculum
-
-We're really excited that you're about to contribute to the [open
-curriculum](https://learn.co/content-license) on [Learn.co](https://learn.co).
-If this is your first time contributing, please continue reading to learn how
-to make the most meaningful and useful impact possible.
-
-## Raising an Issue to Encourage a Contribution
-
-If you notice a problem with the curriculum that you believe needs improvement
-but you're unable to make the change yourself, you should raise a Github issue
-containing a clear description of the problem. Include relevant snippets of
-the content and/or screenshots if applicable. Curriculum owners regularly review
-issue lists and your issue will be prioritized and addressed as appropriate.
-
-## Submitting a Pull Request to Suggest an Improvement
-
-If you see an opportunity for improvement and can make the change yourself go
-ahead and use a typical git workflow to make it happen:
-
-* Fork this curriculum repository
-* Make the change on your fork, with descriptive commits in the standard format
-* Open a Pull Request against this repo
-
-A curriculum owner will review your change and approve or comment on it in due
-course.
-
-# Why Contribute?
-
-Curriculum on Learn is publicly and freely available under Learn's
-[Educational Content License](https://learn.co/content-license). By
-embracing an open-source contribution model, our goal is for the curriculum
-on Learn to become, in time, the best educational content the world has
-ever seen.
-
-We need help from the community of Learners to maintain and improve the
-educational content. Everything from fixing typos, to correcting
-out-dated information, to improving exposition, to adding better examples,
-to fixing tests—all contributions to making the curriculum more effective are
-welcome.

data/lib/templates/javascript_lab_template/LICENSE.md

@@ -1,23 +0,0 @@
-# Learn.co Educational Content License
-
-Copyright (c) 2018 Flatiron School, Inc
-
-The Flatiron School, Inc. owns this Educational Content. However, the Flatiron
-School supports the development and availability of educational materials in
-the public domain. Therefore, the Flatiron School grants Users of the Flatiron
-Educational Content set forth in this repository certain rights to reuse, build
-upon and share such Educational Content subject to the terms of the Educational
-Content License set forth [here](http://learn.co/content-license)
-(http://learn.co/content-license). You must read carefully the terms and
-conditions contained in the Educational Content License as such terms govern
-access to and use of the Educational Content.
-
-Flatiron School is willing to allow you access to and use of the Educational
-Content only on the condition that you accept all of the terms and conditions
-contained in the Educational Content License set forth
-[here](http://learn.co/content-license) (http://learn.co/content-license).  By
-accessing and/or using the Educational Content, you are agreeing to all of the
-terms and conditions contained in the Educational Content License.  If you do
-not agree to any or all of the terms of the Educational Content License, you
-are prohibited from accessing, reviewing or using in any way the Educational
-Content.

data/lib/templates/javascript_lab_template/README.md

@@ -1,16 +0,0 @@
-# Title
-
-## Learning Goals
-
--SWBAT 1
--SWBAT 2
-
-## Introduction
-
-## SWBAT 1
-
-## SWBAT 2
-
-## Conclusion
-
-## Resources

data/lib/templates/javascript_lab_template/index.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="X-UA-Compatible" content="ie=edge">
-  <title>JavaScript Lab</title>
-</head>
-<body>
-  hello
-</body>
-</html>