[CLI] change the default recipe source URL

spec/amber/cli/recipes/recipe_fetcher_spec.cr

@@ -6,6 +6,7 @@ module Amber::Recipes
       Spec.before_each do
         Dir.mkdir_p("./mydefault/app")
         Dir.mkdir_p("./mydefault/controller")
+        Dir.mkdir_p("./mydefault/model")
         Dir.mkdir_p("./mydefault/scaffold")
       end
 
@@ -25,13 +26,26 @@ module Amber::Recipes
           template.should_not be nil
           template.should match(/.+mydefault\/controller$/)
         end
+
+        it "should use a local model folder" do
+          template = RecipeFetcher.new("model", "mydefault").fetch
+          template.should_not be nil
+          template.should match(/.+mydefault\/model$/)
+        end
+
+        it "should use a local scaffold folder" do
+          template = RecipeFetcher.new("scaffold", "mydefault").fetch
+          template.should_not be nil
+          template.should match(/.+mydefault\/scaffold$/)
+        end
       end
     end
 
-    context "using the recipe cache in the current directory" do
+    context "using the recipe cache" do
       Spec.before_each do
         Dir.mkdir_p("#{AMBER_RECIPE_FOLDER}/mydefault/app")
         Dir.mkdir_p("#{AMBER_RECIPE_FOLDER}/mydefault/controller")
+        Dir.mkdir_p("#{AMBER_RECIPE_FOLDER}/mydefault/model")
         Dir.mkdir_p("#{AMBER_RECIPE_FOLDER}/mydefault/scaffold")
       end
 
@@ -51,33 +65,20 @@ module Amber::Recipes
           template.should_not be nil
           template.should match(/.+mydefault\/controller$/)
         end
-      end
-    end
-
-    context "using the recipe cache in the parent directory" do
-      Spec.before_each do
-        Dir.mkdir_p("../#{AMBER_RECIPE_FOLDER}/mydefault/app")
-        Dir.mkdir_p("../#{AMBER_RECIPE_FOLDER}/mydefault/controller")
-        Dir.mkdir_p("../#{AMBER_RECIPE_FOLDER}/mydefault/scaffold")
-      end
 
-      Spec.after_each do
-        FileUtils.rm_rf("../#{AMBER_RECIPE_FOLDER}/mydefault")
-      end
-
-      describe "RecipeFetcher" do
-        it "should use a cached app folder" do
-          template = RecipeFetcher.new("app", "mydefault").fetch
+        it "should use a cached model folder" do
+          template = RecipeFetcher.new("model", "mydefault").fetch
           template.should_not be nil
-          template.should match(/.+mydefault\/app$/)
+          template.should match(/.+mydefault\/model$/)
         end
 
-        it "should use a cached controller folder" do
-          template = RecipeFetcher.new("controller", "mydefault").fetch
+        it "should use a cached scaffold folder" do
+          template = RecipeFetcher.new("scaffold", "mydefault").fetch
           template.should_not be nil
-          template.should match(/.+mydefault\/controller$/)
+          template.should match(/.+mydefault\/scaffold$/)
         end
       end
     end
+
   end
 end

spec/amber/cli/recipes/recipe_spec.cr

@@ -8,6 +8,8 @@ module Amber::Recipes
       Spec.before_each do
         Dir.mkdir_p("./mydefault/app")
         Dir.mkdir_p("./mydefault/controller")
+        Dir.mkdir_p("./mydefault/model")
+        Dir.mkdir_p("./mydefault/scaffold")
       end
 
       Spec.after_each do
@@ -21,6 +23,14 @@ module Amber::Recipes
       it "should return true for default controller" do
         Recipe.can_generate?("controller", recipe).should eq true
       end
+
+      it "should return true for default model" do
+        Recipe.can_generate?("model", recipe).should eq true
+      end
+
+      it "should return true for default scaffold" do
+        Recipe.can_generate?("scaffold", recipe).should eq true
+      end
     end
   end
 end

src/amber/cli/recipes/recipe_fetcher.cr

@@ -12,6 +12,7 @@ module Amber::Recipes
     end
 
     def fetch
+
       if Dir.exists?(@directory)
         return @directory
       end
@@ -26,18 +27,22 @@ module Amber::Recipes
         return "#{template_path}/#{@kind}"
       end
 
+      if @name.not_nil!.downcase.starts_with?("http") && @name.not_nil!.downcase.ends_with?(".zip")
+        return fetch_zip @name.as(String), template_path
+      end
+
       return fetch_url template_path
     end
 
     def recipe_source
-      CLI.config.recipe_source || "https://raw.githubusercontent.com/amberframework/recipes/master/"
+      CLI.config.recipe_source || "https://github.com/amberframework/recipes/releases/download/dist/"
     end
 
-    def fetch_url(template_path)
+    def fetch_zip(url : String, template_path : String)
       # download the recipe zip file from the github repository
-      HTTP::Client.get("#{recipe_source}/#{@name}.zip") do |response|
+      HTTP::Client.get(url) do |response|
         if response.status_code != 200
-          CLI.logger.error "Could not find that recipe #{@name}", "Generate", :light_red
+          CLI.logger.error "Could not find the recipe #{@name} : #{response.status_code} #{response.status_message}", "Generate", :light_red
           return nil
         end
 
@@ -64,5 +69,9 @@ module Amber::Recipes
       CLI.logger.error "Cannot generate #{@kind} from #{@name} recipe", "Generate", :light_red
       return nil
     end
+
+    def fetch_url(template_path : String)
+      return fetch_zip "#{recipe_source}/#{@name}.zip", template_path
+    end
   end
 end