Merge pull request rabbitmq#3 from rabbitmq/lrb-mozilla-2.0

Update license

Author: lukebakken

LICENSE

@@ -1,25 +1,15 @@
+## This Source Code Form is subject to the terms of the Mozilla Public
+## License, v. 2.0. If a copy of the MPL was not distributed with this
+## file, You can obtain one at https://mozilla.org/MPL/2.0/.
 ##
-## The contents of this file are subject to the Mozilla Public License
-## Version 1.1 (the "License"); you may not use this file except in
-## compliance with the License. You may obtain a copy of the License
-## at https://www.mozilla.org/MPL/
-##
-## Software distributed under the License is distributed on an "AS IS"
-## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-## the License for the specific language governing rights and
-## limitations under the License.
-##
-## The Original Code is mix_task_archive_deps.
-##
-## The Initial Developer of the Original Code is Daniil Fedotov.
-## Copyright (c) 2017 Daniil Fedotov.  All rights reserved.
-##
+## Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
 
 defmodule Mix.Archive.Build.Helpers do
   def destination(opts) do
-    opts[:destination] || Path.join(Mix.Project.build_path, "archives")
+    opts[:destination] || Path.join(Mix.Project.build_path(), "archives")
   end
+
   def skipped_apps(opts) do
     (opts[:skip] || "") |> String.split(" ") |> Enum.map(&String.to_atom/1)
   end
-end
+end

lib/helpers.ex

@@ -1,20 +1,8 @@
+## This Source Code Form is subject to the terms of the Mozilla Public
+## License, v. 2.0. If a copy of the MPL was not distributed with this
+## file, You can obtain one at https://mozilla.org/MPL/2.0/.
 ##
-## The contents of this file are subject to the Mozilla Public License
-## Version 1.1 (the "License"); you may not use this file except in
-## compliance with the License. You may obtain a copy of the License
-## at https://www.mozilla.org/MPL/
-##
-## Software distributed under the License is distributed on an "AS IS"
-## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-## the License for the specific language governing rights and
-## limitations under the License.
-##
-## The Original Code is mix_task_archive_deps.
-##
-## The Initial Developer of the Original Code is Daniil Fedotov.
-## Copyright (c) 2017 Daniil Fedotov.  All rights reserved.
-##
-
+## Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
 
 defmodule Mix.Tasks.Archive.Build.All do
   use Mix.Task
@@ -50,24 +38,24 @@ defmodule Mix.Tasks.Archive.Build.All do
   * `--skip` - a space-separated list of dependencies to skip
   """
 
-
   @switches [destination: :string, elixir: :boolean, skip: :string]
   @aliases [o: :destination, e: :elixir, l: :list]
 
-  @spec run(OptionParser.argv) :: :ok
+  @spec run(OptionParser.argv()) :: :ok
   def run(argv) do
     Mix.Tasks.Loadpaths.run([])
     {opts, _} = OptionParser.parse!(argv, aliases: @aliases, strict: @switches)
     destination = Mix.Archive.Build.Helpers.destination(opts)
     Mix.Tasks.Archive.Build.Deps.build_archives(opts)
 
-    archive_name = Mix.Local.name_for(:archives, Mix.Project.config)
+    archive_name = Mix.Local.name_for(:archives, Mix.Project.config())
     archive_path = Path.join([destination, archive_name])
     Mix.Tasks.Archive.Build.run(["-o", archive_path])
 
     if opts[:elixir] do
       Mix.Tasks.Archive.Build.Elixir.build_archives(opts)
     end
+
     :ok
   end
 end

lib/mix/tasks/archive/build.all.ex

@@ -1,20 +1,8 @@
+## This Source Code Form is subject to the terms of the Mozilla Public
+## License, v. 2.0. If a copy of the MPL was not distributed with this
+## file, You can obtain one at https://mozilla.org/MPL/2.0/.
 ##
-## The contents of this file are subject to the Mozilla Public License
-## Version 1.1 (the "License"); you may not use this file except in
-## compliance with the License. You may obtain a copy of the License
-## at https://www.mozilla.org/MPL/
-##
-## Software distributed under the License is distributed on an "AS IS"
-## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-## the License for the specific language governing rights and
-## limitations under the License.
-##
-## The Original Code is mix_task_archive_deps.
-##
-## The Initial Developer of the Original Code is Daniil Fedotov.
-## Copyright (c) 2017 Daniil Fedotov.  All rights reserved.
-##
-
+## Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
 
 defmodule Mix.Tasks.Archive.Build.All.List do
   use Mix.Task
@@ -36,36 +24,33 @@ defmodule Mix.Tasks.Archive.Build.All.List do
   * `--skip` - a space-separated list of dependencies to skip
   """
 
-
-  @switches [destination: :string,
-             elixir: :boolean,
-             separator: :string,
-             skip: :string]
+  @switches [destination: :string, elixir: :boolean, separator: :string, skip: :string]
   @aliases [o: :destination, e: :elixir, s: :separator]
 
-  @spec run(OptionParser.argv) :: :ok
+  @spec run(OptionParser.argv()) :: :ok
   def run(argv) do
     Mix.Tasks.Loadpaths.run([])
     {opts, _} = OptionParser.parse!(argv, aliases: @aliases, strict: @switches)
     destination = Mix.Archive.Build.Helpers.destination(opts)
     elixir = opts[:elixir] || false
     separator = opts[:separator] || "\n"
 
-    archive_name = Mix.Local.name_for(:archives, Mix.Project.config)
+    archive_name = Mix.Local.name_for(:archives, Mix.Project.config())
     archive_path = Path.join([destination, archive_name])
 
     deps_archives = Mix.Tasks.Archive.Build.Deps.list_archives(opts)
 
-    elixir_archives = if elixir do
-      Mix.Tasks.Archive.Build.Elixir.list_archives(opts)
-    else
-      []
-    end
+    elixir_archives =
+      if elixir do
+        Mix.Tasks.Archive.Build.Elixir.list_archives(opts)
+      else
+        []
+      end
 
     [[archive_path], deps_archives, elixir_archives]
-    |> Enum.concat
+    |> Enum.concat()
     |> Enum.join(separator)
-    |> IO.puts
+    |> IO.puts()
 
     :ok
   end

lib/mix/tasks/archive/build.all.list.ex

@@ -1,24 +1,12 @@
+## This Source Code Form is subject to the terms of the Mozilla Public
+## License, v. 2.0. If a copy of the MPL was not distributed with this
+## file, You can obtain one at https://mozilla.org/MPL/2.0/.
 ##
-## The contents of this file are subject to the Mozilla Public License
-## Version 1.1 (the "License"); you may not use this file except in
-## compliance with the License. You may obtain a copy of the License
-## at https://www.mozilla.org/MPL/
-##
-## Software distributed under the License is distributed on an "AS IS"
-## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-## the License for the specific language governing rights and
-## limitations under the License.
-##
-## The Original Code is mix_task_archive_deps.
-##
-## The Initial Developer of the Original Code is Daniil Fedotov.
-## Copyright (c) 2017 Daniil Fedotov.  All rights reserved.
-##
-
+## Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
 
 defmodule Mix.Tasks.Archive.Build.Deps do
   use Mix.Task
-  alias  Mix.Archive.Build.Helpers, as: Helpers
+  alias Mix.Archive.Build.Helpers, as: Helpers
 
   @shortdoc "Archives the project dependencies into .ez files"
 
@@ -44,38 +32,41 @@ defmodule Mix.Tasks.Archive.Build.Deps do
   @switches [destination: :string, skip: :string]
   @aliases [o: :destination]
 
-  @spec run(OptionParser.argv) :: :ok
+  @spec run(OptionParser.argv()) :: :ok
   def run(argv) do
     {opts, _} = OptionParser.parse!(argv, aliases: @aliases, strict: @switches)
     build_archives(opts)
   end
 
   def build_archives(opts) do
     list(opts)
-    |>  Enum.each(fn({app_dir, archive_path}) ->
-          Mix.Tasks.Archive.Build.run(["-i", app_dir, "-o", archive_path])
-        end)
+    |> Enum.each(fn {app_dir, archive_path} ->
+      Mix.Tasks.Archive.Build.run(["-i", app_dir, "-o", archive_path])
+    end)
+
     :ok
   end
 
   def list_archives(opts) do
     list(opts)
-    |> Enum.map(fn({_, archive_path}) -> archive_path end)
+    |> Enum.map(fn {_, archive_path} -> archive_path end)
   end
 
   defp list(opts) do
-    build_path = Mix.Project.build_path
+    build_path = Mix.Project.build_path()
     destination = Helpers.destination(opts)
     skip = Helpers.skipped_apps(opts)
 
     ## Build delendencies archives
-    Mix.Dep.load_on_environment(env: Mix.env)
-    |>  Enum.filter(fn(%Mix.Dep{app: app}) -> not Enum.member?(skip, app) end)
-    |>  Enum.map(fn(%Mix.Dep{app: app, status: status}) ->
-      version = case status do
-        {:ok, vsn} when vsn != nil -> vsn
-        reason -> :erlang.error({:invalid_status, reason})
-      end
+    Mix.Dep.load_on_environment(env: Mix.env())
+    |> Enum.filter(fn %Mix.Dep{app: app} -> not Enum.member?(skip, app) end)
+    |> Enum.map(fn %Mix.Dep{app: app, status: status} ->
+      version =
+        case status do
+          {:ok, vsn} when vsn != nil -> vsn
+          reason -> :erlang.error({:invalid_status, reason})
+        end
+
       archive_path = Path.join([destination, "#{app}-#{version}.ez"])
       app_dir = Path.join([build_path, "lib", "#{app}"])
       {app_dir, archive_path}

lib/mix/tasks/archive/build.deps.ex

@@ -1,25 +1,13 @@
+## This Source Code Form is subject to the terms of the Mozilla Public
+## License, v. 2.0. If a copy of the MPL was not distributed with this
+## file, You can obtain one at https://mozilla.org/MPL/2.0/.
 ##
-## The contents of this file are subject to the Mozilla Public License
-## Version 1.1 (the "License"); you may not use this file except in
-## compliance with the License. You may obtain a copy of the License
-## at https://www.mozilla.org/MPL/
-##
-## Software distributed under the License is distributed on an "AS IS"
-## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-## the License for the specific language governing rights and
-## limitations under the License.
-##
-## The Original Code is mix_task_archive_deps.
-##
-## The Initial Developer of the Original Code is Daniil Fedotov.
-## Copyright (c) 2017 Daniil Fedotov.  All rights reserved.
-##
-
+## Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
 
 defmodule Mix.Tasks.Archive.Build.Elixir do
   use Mix.Task
 
-  alias  Mix.Archive.Build.Helpers, as: Helpers
+  alias Mix.Archive.Build.Helpers, as: Helpers
 
   @shortdoc "Archives elixir applications referenced by the project into .ez files"
 
@@ -53,7 +41,7 @@ defmodule Mix.Tasks.Archive.Build.Elixir do
   @aliases [o: :destination, a: :all_applications]
   @elixir_apps [:elixir, :eex, :ex_unit, :iex, :logger, :mix]
 
-  @spec run(OptionParser.argv) :: :ok
+  @spec run(OptionParser.argv()) :: :ok
   def run(argv) do
     Mix.Tasks.Loadpaths.run([])
     {opts, _} = OptionParser.parse!(argv, aliases: @aliases, strict: @switches)
@@ -62,17 +50,16 @@ defmodule Mix.Tasks.Archive.Build.Elixir do
 
   def build_archives(opts) do
     list(opts)
-    |>  Enum.each(fn({lib_dir, archive_path}) ->
-          Mix.Tasks.Archive.Build.run(["-i", lib_dir,
-                                       "-o", archive_path])
-        end)
+    |> Enum.each(fn {lib_dir, archive_path} ->
+      Mix.Tasks.Archive.Build.run(["-i", lib_dir, "-o", archive_path])
+    end)
 
     :ok
   end
 
   def list_archives(opts) do
     list(opts)
-    |> Enum.map(fn({_, archive_path}) -> archive_path end)
+    |> Enum.map(fn {_, archive_path} -> archive_path end)
   end
 
   defp list(opts) do
@@ -81,35 +68,39 @@ defmodule Mix.Tasks.Archive.Build.Elixir do
     skip = Helpers.skipped_apps(opts)
 
     get_required_apps(all_applications)
-    |>  Enum.filter(fn(elixir_app) -> not Enum.member?(skip, elixir_app) end)
-    |>  Enum.map(fn(elixir_app) ->
-          lib_dir = :code.lib_dir(elixir_app)
-          archive_name = "#{elixir_app}-#{Application.spec(elixir_app, :vsn)}.ez"
-          archive_path = Path.join([destination, archive_name])
-          {lib_dir, archive_path}
-        end)
+    |> Enum.filter(fn elixir_app -> not Enum.member?(skip, elixir_app) end)
+    |> Enum.map(fn elixir_app ->
+      lib_dir = :code.lib_dir(elixir_app)
+      archive_name = "#{elixir_app}-#{Application.spec(elixir_app, :vsn)}.ez"
+      archive_path = Path.join([destination, archive_name])
+      {lib_dir, archive_path}
+    end)
   end
 
   defp get_required_apps(true) do
     @elixir_apps
   end
+
   defp get_required_apps(false) do
     required_apps = get_applications()
+
     @elixir_apps
-    |> Enum.filter(fn(app) -> Enum.member?(required_apps, app) end)
+    |> Enum.filter(fn app -> Enum.member?(required_apps, app) end)
   end
 
   defp get_applications() do
-    application = Mix.Project.config[:app]
+    application = Mix.Project.config()[:app]
     get_applications_recursively([application])
   end
 
   defp get_applications_recursively(applications) do
-    Enum.flat_map(applications,
-                  fn(app) ->
-                    Application.load(app)
-                    deps = Application.spec(app, :applications) || []
-                    [app | get_applications_recursively(deps)]
-                  end)
+    Enum.flat_map(
+      applications,
+      fn app ->
+        Application.load(app)
+        deps = Application.spec(app, :applications) || []
+        [app | get_applications_recursively(deps)]
+      end
+    )
   end
 end

lib/mix/tasks/archive/build.elixir.ex

@@ -1,19 +1,8 @@
+## This Source Code Form is subject to the terms of the Mozilla Public
+## License, v. 2.0. If a copy of the MPL was not distributed with this
+## file, You can obtain one at https://mozilla.org/MPL/2.0/.
 ##
-## The contents of this file are subject to the Mozilla Public License
-## Version 1.1 (the "License"); you may not use this file except in
-## compliance with the License. You may obtain a copy of the License
-## at https://www.mozilla.org/MPL/
-##
-## Software distributed under the License is distributed on an "AS IS"
-## basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-## the License for the specific language governing rights and
-## limitations under the License.
-##
-## The Original Code is mix_task_archive_deps.
-##
-## The Initial Developer of the Original Code is Daniil Fedotov.
-## Copyright (c) 2017 Daniil Fedotov.  All rights reserved.
-##
+## Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
 
 
 defmodule MixTaskArchiveDeps.Mixfile do
@@ -55,8 +44,8 @@ defmodule MixTaskArchiveDeps.Mixfile do
   defp package() do
     [name: :mix_task_archive_deps,
      files: ["lib", "mix.exs", "README*", "LICENSE*"],
-     maintainers: ["Daniil Fedotov"],
-     licenses: ["MPL 1.1"],
-     links: %{"GitHub" => "https://github.com/hairyhum/mix_task_archive_deps"}]
+     maintainers: ["Luke Bakken", "Michael Klishin"],
+     licenses: ["MPL 2.0"],
+     links: %{"GitHub" => "https://github.com/rabbitmq/mix_task_archive_deps"}]
   end
 end