learn_duplicate 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 266556086de7e42a49f18dfbc79d114dc8eebd13c654ce8c47b98bf3c3ad3114
-  data.tar.gz: 0501e81825b21b26081cf4a0832105709aef7fd9792ee980b3ee42b3cf6a06e4
+  metadata.gz: 3cfdd59991a706b75c64d8de8e3cee1fc0e1ad16ee5dfb979fd5cb3da6464dd5
+  data.tar.gz: 146a1bb4d4dff291886cb16d95c2766a3ed3dafe38a111ee2a0bbbc003561b17
 SHA512:
-  metadata.gz: c73c0a5fda1bd889cb80bc7d5c3bfbfd1a2eb0791e1f3e7cd7039b41b0339cfd6c2cd3715ede1f81fcbf3d3671eef1afdc42e94c0963f3554c437e7b356fd352
-  data.tar.gz: fa202db6205cc4e5c52d1183baca77ae7a46e05f12722c8fb39552355566d8173d8edc3250cd37ee04aa56d4ca3ded59c02076af8470f002d122a950b588465a
+  metadata.gz: e5d4fc1256d1807abb555ecf4e7bb0aeb2f4c88d9448131bec80bf7f41ad06eded366dc94d2380dc5f5d0324557445a0b55aafc7bc4a7255c8877f78df4ca90c
+  data.tar.gz: 29f2ed91e97f14997d816322a96a81b657117ecd23aa6cb79890bfa893b49fe31d1de1aa9c8bb7867a2d1f6e7b3bc8178ea40043424b03408057fc37d83392ad

data/lib/learn_duplicate.rb

@@ -8,16 +8,21 @@ class LearnDuplicate
   def initialize(opts={})
     # For non-interactive mode
     if opts[:ni]
-      validate_repo = ->(url) do
+      validate_repo = ->(repo_name) do
+        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
-        url
+        repo_name
       end
 
-      @old_repo = validate_repo.call(GITHUB_ORG + opts[:source_name])
+      de_apiify_url = ->(api_url) do
+        api_url.gsub(/(api\.|repos\/)/, '')
+      end
+
+      @old_repo = validate_repo.call(opts[:source_name])
 
       if opts[:destination].length >= 100
         raise ArgumentError, 'Repository names must be shorter than 100 characters'
@@ -30,12 +35,12 @@ class LearnDuplicate
           create_new_repo
           puts ''
           puts 'To access local folder, change directory into ' + @repo_name + '/'
-          puts "Repository available at #{GITHUB_ORG}" + @repo_name
+          puts "Repository available at #{de_apiify_url.call(GITHUB_ORG + @repo_name)}"
         rescue => e
           STDERR.puts(e.message)
         end
       else
-        puts "DRY RUN: Would execute copy of: #{@old_repo} to #{@repo_name}"
+        puts "DRY RUN: Would execute copy of: #{de_apiify_url.call(@old_repo)} to #{@repo_name}"
       end
 
       exit
@@ -124,10 +129,12 @@ class LearnDuplicate
 
   def rename_repo
     cmd = "mv -f #{@old_repo} #{@repo_name}"
+    cd_into_and("git remote rename origin origin-old")
     `#{cmd}`
   end
 
-  def git_create
+  def git_create_and_set_new_origin
+    # Creates repo **and** assigns new remote to 'origin' shortname
     cmd = cd_into_and("hub create learn-co-curriculum/#{@repo_name}")
     `#{cmd}`
   end
@@ -139,8 +146,13 @@ class LearnDuplicate
   end
 
   def git_push
-    cmd = cd_into_and('git push -u origin master')
-    `#{cmd}`
+    # 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|
+    ]
+    cmds.each { |cmd| `#{cd_into_and(cmd)}` }
   end
 
   def check_ssh_config
@@ -152,16 +164,16 @@ class LearnDuplicate
     # 'cd' doesn't work the way it would in the shell, must be used before every command
     puts 'Cloning old repository'
     git_clone
-    puts 'Renaming old repository with new name'
+    puts "Renaming old directory with new name: #{@repo_name}"
     rename_repo
     puts ''
     puts 'Creating new remote learn-co-curriculum repository'
-    git_create
+    git_create_and_set_new_origin
     puts ''
-    puts 'Setting new git remote'
+    puts 'Setting new git remote based on SSH settings'
     git_set_remote
     puts ''
-    puts 'Pushing to new remote'
+    puts 'Pushing all old-remote branches to new remote'
     git_push
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: learn_duplicate
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - flatironschool